# HG changeset patch # User Matti Hamalainen # Date 1558934821 -10800 # Node ID a17b37872d8e3fcd3a5e15334c733fa6b952c744 # Parent 47ddbedf5b56e24e6250827065dfe5225a93109b Simplistic conversion fixups. diff -r 47ddbedf5b56 -r a17b37872d8e tools/gfxconv.c --- a/tools/gfxconv.c Mon May 27 06:01:32 2019 +0300 +++ b/tools/gfxconv.c Mon May 27 08:27:01 2019 +0300 @@ -1238,6 +1238,18 @@ 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) + { + 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) + { + // XXX TODO: Handle FLI mc->hires differently? + } + if ((dst->fmt->type & D64_FMT_FLI) && (src->fmt->type & D64_FMT_FLI) == 0) { dmMsg(1, "Upconverting multicolor to FLI.\n");