diff tools/lib64fmts.c @ 2208:90ec1ec89c56

Revamp the palette handling in lib64gfx somewhat, add helper functions to lib64util for handling external palette file options and add support for specifying one of the "internal" palettes or external (.act) palette file to gfxconv and 64vw.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 14 Jun 2019 05:01:12 +0300
parents 9f3fb4004c20
children 75b5bb490f38
line wrap: on
line diff
--- a/tools/lib64fmts.c	Fri Jun 14 03:28:46 2019 +0300
+++ b/tools/lib64fmts.c	Fri Jun 14 05:01:12 2019 +0300
@@ -1545,10 +1545,7 @@
 {
     int res;
 
-    if (spec->pal != NULL)
-        dst->pal = spec->pal;
-    else
-    if ((res = dmC64SetImagePalette(dst, spec->cpal, TRUE)) != DMERR_OK)
+    if ((res = dmC64SetImagePalette(dst, spec, TRUE)) != DMERR_OK)
         return res;
 
     return dmC64ConvertGenericBMP2Image(dst, src, fmt, spec);