Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 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 0b9315070001
children 52985e4bc9ce
comparison
equal deleted inserted replaced
2180:33cf1b330b7b 2181:560ba06a99eb
1236 dst->d022 = src->d022; 1236 dst->d022 = src->d022;
1237 dst->d023 = src->d023; 1237 dst->d023 = src->d023;
1238 dst->d024 = src->d024; 1238 dst->d024 = src->d024;
1239 1239
1240 // Try to do some simple fixups 1240 // Try to do some simple fixups
1241 if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_MC && 1241 if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC &&
1242 (src->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES) 1242 (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES)
1243 { 1243 {
1244 dmC64MemBlockCopy(&dst->screen[0], &src->screen[0]); 1244 dmC64MemBlockCopy(&dst->screen[0], &src->screen[0]);
1245 } 1245 }
1246 else 1246 else
1247 if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES && 1247 if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES &&
1248 (src->fmt->type & D64_FMT_MASK) == D64_FMT_MC) 1248 (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC)
1249 { 1249 {
1250 // XXX TODO: Handle FLI mc->hires differently? 1250 // XXX TODO: Handle FLI mc->hires differently?
1251 } 1251 }
1252 1252
1253 if ((dst->fmt->type & D64_FMT_FLI) && (src->fmt->type & D64_FMT_FLI) == 0) 1253 if ((dst->fmt->type & D64_FMT_FLI) && (src->fmt->type & D64_FMT_FLI) == 0)