Mercurial > hg > dmlib

changeset 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 42fb39da7dde
children b2dd6a72d162
files tools/gfxconv.c tools/lib64gfx.c tools/lib64gfx.h
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tools/gfxconv.c	Thu May 10 18:53:42 2018 +0300
+++ b/tools/gfxconv.c	Thu May 10 19:58:52 2018 +0300
@@ -1525,10 +1525,7 @@
             outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_IFMT_PALETTE, -1);
         }
 
-        outImage->constpal = TRUE;
-        outImage->pal      = dmDefaultC64Palette;
-        outImage->ncolors  = C64_NCOLORS;
-        outImage->ctransp  = 255;
+        dmSetDefaultC64Palette(outImage);
 
         while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount))
         {
@@ -1775,6 +1772,7 @@
                             goto error;
                         }
 
+                        dmSetDefaultC64Palette(outImage);
                         res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
                         break;
 
@@ -1792,6 +1790,7 @@
                             goto error;
                         }
 
+                        dmSetDefaultC64Palette(outImage);
                         res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
                         break;
 
--- a/tools/lib64gfx.c	Thu May 10 18:53:42 2018 +0300
+++ b/tools/lib64gfx.c	Thu May 10 19:58:52 2018 +0300
@@ -34,6 +34,15 @@
 };
 
 
+void dmSetDefaultC64Palette(DMImage *img)
+{
+    img->constpal = TRUE;
+    img->pal      = dmDefaultC64Palette;
+    img->ncolors  = C64_NCOLORS;
+    img->ctransp  = 255;
+}
+
+
 #define DM_GET_ADDR_LO(addr) ((addr) & 0xff)
 #define DM_GET_ADDR_HI(addr) (((addr) >> 8) & 0xff)
 
--- a/tools/lib64gfx.h	Thu May 10 18:53:42 2018 +0300
+++ b/tools/lib64gfx.h	Thu May 10 19:58:52 2018 +0300
@@ -187,6 +187,8 @@
 extern const DMC64ImageFormat  dmC64ImageFormats[];
 extern const int         ndmC64ImageFormats;
 
+void      dmSetDefaultC64Palette(DMImage *img);
+
 
 DMC64Image *dmC64ImageAlloc(const DMC64ImageFormat *fmt);
 void      dmC64ImageFree(DMC64Image *img);