Mercurial > hg > dmlib
changeset 2180:33cf1b330b7b
s/D64_FMT_MASK/D64_FMT_MODE_MASK/g
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 12 Jun 2019 18:22:04 +0300 |
parents | 8d53da5bf067 |
children | 560ba06a99eb |
files | tools/lib64gfx.c tools/lib64gfx.h |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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