Mercurial > hg > dmlib

changeset 2181:560ba06a99eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops, forgot these from previous commit.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 12 Jun 2019 18:25:46 +0300
parents 33cf1b330b7b
children 52985e4bc9ce
files tools/gfxconv.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tools/gfxconv.c	Wed Jun 12 18:22:04 2019 +0300
+++ b/tools/gfxconv.c	Wed Jun 12 18:25:46 2019 +0300
@@ -1238,14 +1238,14 @@
     dst->d024    = src->d024;
 
     // Try to do some simple fixups
-    if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_MC &&
-        (src->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES)
+    if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC &&
+        (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES)
     {
         dmC64MemBlockCopy(&dst->screen[0], &src->screen[0]);
     }
     else
-    if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES &&
-        (src->fmt->type & D64_FMT_MASK) == D64_FMT_MC)
+    if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES &&
+        (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC)
     {
         // XXX TODO: Handle FLI mc->hires differently?
     }