# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1525971532 -10800
# Node ID dcff9ac95d3f37ff4d3235c14bd46c4000723a49
# Parent  42fb39da7dde8b28ffb256eedfecf8079da28259
Add function to set DMImage's palette to default C64 palette and use it.

diff -r 42fb39da7dde -r dcff9ac95d3f tools/gfxconv.c
--- 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;
 
diff -r 42fb39da7dde -r dcff9ac95d3f tools/lib64gfx.c
--- 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)
 
diff -r 42fb39da7dde -r dcff9ac95d3f tools/lib64gfx.h
--- 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);