Mercurial > hg > dmlib

changeset 1730:881a3fc421d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f4015f6cb173
children 474055f25ab0
files tools/64vw.c tools/gfxconv.c tools/lib64gfx.c tools/libgfx.c
diffstat 4 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tools/64vw.c	Thu Jun 07 15:54:19 2018 +0300
+++ b/tools/64vw.c	Fri Jun 08 22:03:19 2018 +0300
@@ -210,17 +210,23 @@
     DMImage bmap;
     int ret;
 
-    bmap.size = surf->pitch * surf->h;
-    bmap.data = surf->pixels;
-    bmap.pitch = surf->pitch;
-    bmap.width = surf->w;
-    bmap.height = surf->h;
+    memset(&bmap, 0, sizeof(bmap));
+    bmap.size     = surf->pitch * surf->h;
+    bmap.data     = surf->pixels;
+    bmap.pitch    = surf->pitch;
+    bmap.width    = surf->w;
+    bmap.height   = surf->h;
+    bmap.ncolors  = C64_NCOLORS;
+    bmap.constpal = TRUE;
+    bmap.pal      = dmDefaultC64Palette;
 
     if (fmt->convertFrom != NULL)
         ret = fmt->convertFrom(&bmap, cimage, fmt);
     else
         ret = dmC64ConvertGenericBMP2Image(&bmap, cimage, fmt);
 
+    SDL_SetPaletteColors(surf->format->palette, (SDL_Color *) bmap.pal, 0, bmap.ncolors);
+
     return ret;
 }
 
@@ -485,7 +491,6 @@
                 goto exit;
             }
 
-            SDL_SetPaletteColors(surf->format->palette, (SDL_Color *)dmDefaultC64Palette, 0, C64_NCOLORS);
 
             if (texture != NULL)
                 SDL_DestroyTexture(texture);
--- a/tools/gfxconv.c	Thu Jun 07 15:54:19 2018 +0300
+++ b/tools/gfxconv.c	Fri Jun 08 22:03:19 2018 +0300
@@ -1791,7 +1791,6 @@
                             goto error;
                         }
 
-                        dmSetDefaultC64Palette(outImage);
                         res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
                         break;
 
@@ -1814,7 +1813,6 @@
                             goto error;
                         }
 
-                        dmSetDefaultC64Palette(outImage);
                         res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
                         break;
 
--- a/tools/lib64gfx.c	Thu Jun 07 15:54:19 2018 +0300
+++ b/tools/lib64gfx.c	Fri Jun 08 22:03:19 2018 +0300
@@ -1296,6 +1296,7 @@
     // Set partial palette information
     dst->ncolors  = C64_NCOLORS;
     dst->constpal = TRUE;
+    dst->pal      = dmDefaultC64Palette;
 
     // Convert
     if (fmt->convertFrom != NULL)
--- a/tools/libgfx.c	Thu Jun 07 15:54:19 2018 +0300
+++ b/tools/libgfx.c	Fri Jun 08 22:03:19 2018 +0300
@@ -172,6 +172,8 @@
 
     img->ncolors = ncolors;
     img->ctransp = ctransp;
+    img->constpal = FALSE;
+
     return dmPaletteAlloc(&(img->pal), ncolors, ctransp);
 }