comparison tools/gfxconv.c @ 1730:881a3fc421d8

Use the default C64 palette whenever we need it, but make it possible to override it.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 08 Jun 2018 22:03:19 +0300
parents 55db8d6dffa5
children 5e928618fdc8
comparison
equal deleted inserted replaced
1729:f4015f6cb173 1730:881a3fc421d8
1789 { 1789 {
1790 dmErrorMsg("Error in bitmap to image conversion.\n"); 1790 dmErrorMsg("Error in bitmap to image conversion.\n");
1791 goto error; 1791 goto error;
1792 } 1792 }
1793 1793
1794 dmSetDefaultC64Palette(outImage);
1795 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE); 1794 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
1796 break; 1795 break;
1797 1796
1798 case FFMT_BITMAP: 1797 case FFMT_BITMAP:
1799 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image, &dmC64ImageFormats[optOutSubFormat], inC64Fmt)) != DMERR_OK) 1798 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image, &dmC64ImageFormats[optOutSubFormat], inC64Fmt)) != DMERR_OK)
1812 { 1811 {
1813 dmErrorMsg("Error in bitmap to template image conversion.\n"); 1812 dmErrorMsg("Error in bitmap to template image conversion.\n");
1814 goto error; 1813 goto error;
1815 } 1814 }
1816 1815
1817 dmSetDefaultC64Palette(outImage);
1818 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor); 1816 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
1819 break; 1817 break;
1820 1818
1821 default: 1819 default:
1822 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n"); 1820 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n");