# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1560352924 -10800
# Node ID 33cf1b330b7b5f45f8b7e421a8bfe3c255b01bf1
# Parent  8d53da5bf067715024fc7739976a01bd5327b043
s/D64_FMT_MASK/D64_FMT_MODE_MASK/g

diff -r 8d53da5bf067 -r 33cf1b330b7b tools/lib64gfx.c
--- a/tools/lib64gfx.c	Wed Jun 12 17:55:01 2019 +0300
+++ b/tools/lib64gfx.c	Wed Jun 12 18:22:04 2019 +0300
@@ -90,7 +90,7 @@
     static const char *fmtModesShort[] = { "*", "HiR", "MC", "ECM" };
     static const char *fmtModesLong[] = { "*", "HiRes", "MultiColor", "Extended Color Mode" };
     const char *fmtStr;
-    size_t nfmt = type & D64_FMT_MASK;
+    size_t nfmt = type & D64_FMT_MODE_MASK;
 
     if (nfmt < sizeof(fmtModesShort) / sizeof(fmtModesShort[0]))
         fmtStr = lng ? fmtModesLong[nfmt] : fmtModesShort[nfmt];
@@ -1454,7 +1454,7 @@
     if (src->fmt->type & D64_FMT_CHAR)
         getPixel = fmtGetGenericCharPixel;
     else
-    switch (src->fmt->type & D64_FMT_MASK)
+    switch (src->fmt->type & D64_FMT_MODE_MASK)
     {
         case D64_FMT_MC    : getPixel = fmtGetGenericMCPixel; break;
         case D64_FMT_HIRES : getPixel = fmtGetGenericSCPixel; break;
diff -r 8d53da5bf067 -r 33cf1b330b7b tools/lib64gfx.h
--- a/tools/lib64gfx.h	Wed Jun 12 17:55:01 2019 +0300
+++ b/tools/lib64gfx.h	Wed Jun 12 18:22:04 2019 +0300
@@ -61,7 +61,7 @@
     D64_FMT_HIRES        = 0x0001, // Hi-res
     D64_FMT_MC           = 0x0002, // MultiColor
     D64_FMT_ECM          = 0x0003, // ECM mode (applies only to character mode)
-    D64_FMT_MASK         = 0x000f,
+    D64_FMT_MODE_MASK    = 0x000f,
 
     D64_FMT_ILACE        = 0x0010, // Interlace
     D64_FMT_FLI          = 0x0020, // FLI