Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 1457:dcff9ac95d3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add function to set DMImage's palette to default C64 palette and use it.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 10 May 2018 19:58:52 +0300
parents 260c413304f3
children 73e00bf7531c
comparison
equal deleted inserted replaced
1456:42fb39da7dde 1457:dcff9ac95d3f
1523 outIHeight++; 1523 outIHeight++;
1524 1524
1525 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_IFMT_PALETTE, -1); 1525 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_IFMT_PALETTE, -1);
1526 } 1526 }
1527 1527
1528 outImage->constpal = TRUE; 1528 dmSetDefaultC64Palette(outImage);
1529 outImage->pal = dmDefaultC64Palette;
1530 outImage->ncolors = C64_NCOLORS;
1531 outImage->ctransp = 255;
1532 1529
1533 while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount)) 1530 while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount))
1534 { 1531 {
1535 dmMemset(bufData, 0, bufSize); 1532 dmMemset(bufData, 0, bufSize);
1536 1533
1773 { 1770 {
1774 dmErrorMsg("Error in bitmap to image conversion.\n"); 1771 dmErrorMsg("Error in bitmap to image conversion.\n");
1775 goto error; 1772 goto error;
1776 } 1773 }
1777 1774
1775 dmSetDefaultC64Palette(outImage);
1778 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE); 1776 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
1779 break; 1777 break;
1780 1778
1781 case FFMT_BITMAP: 1779 case FFMT_BITMAP:
1782 res = dmWriteBitmap(optOutFilename, inC64Image, &dmC64ImageFormats[optOutSubFormat], TRUE); 1780 res = dmWriteBitmap(optOutFilename, inC64Image, &dmC64ImageFormats[optOutSubFormat], TRUE);
1790 { 1788 {
1791 dmErrorMsg("Error in bitmap to template image conversion.\n"); 1789 dmErrorMsg("Error in bitmap to template image conversion.\n");
1792 goto error; 1790 goto error;
1793 } 1791 }
1794 1792
1793 dmSetDefaultC64Palette(outImage);
1795 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor); 1794 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
1796 break; 1795 break;
1797 1796
1798 default: 1797 default:
1799 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n"); 1798 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n");