Mercurial > hg > dmlib

diff tools/64vw.c @ 2265:48b48251610a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor how the image "mode/type" is handled. It is still not perfect for our purposes, but better now.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 Jun 2019 02:03:35 +0300
parents 2e656da1b10b
children 8ad08ab4975b
line wrap: on
line diff
--- a/tools/64vw.c	Mon Jun 17 01:44:54 2019 +0300
+++ b/tools/64vw.c	Mon Jun 17 02:03:35 2019 +0300
@@ -224,7 +224,7 @@
     bmap.width    = surf->w;
     bmap.height   = surf->h;
 
-    mixedPalette  = (cimage->fmt->type & D64_FMT_ILACE) &&
+    mixedPalette  = (cimage->extraInfo[D64_EI_MODE] & D64_FMT_ILACE) &&
         cimage->extraInfo[D64_EI_ILACE_TYPE] == D64_ILACE_COLOR;
 
     if ((res = dmC64SetImagePalette(&bmap, spec, mixedPalette)) != DMERR_OK)
@@ -310,7 +310,7 @@
     {
         forced = &dmC64ImageFormats[optForcedFormat];
         dmMsg(0, "Forced %s format image, type %d, %s\n",
-            forced->name, forced->format->type, forced->fext);
+            forced->name, forced->format->mode, forced->fext);
     }
     else
         forced = NULL;