comparison tools/gfxconv.c @ 1947:8896d5676f1b

Architectural change: remove some duplicated variables from DMC64Image structure and replace them with a pointer to DMC64ImageCommonFormat.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 29 Jun 2018 17:17:14 +0300
parents c5a46cb4cce5
children 161e731eb152
comparison
equal deleted inserted replaced
1946:c30dfd5e3227 1947:8896d5676f1b
1135 dst->d022 = src->d022; 1135 dst->d022 = src->d022;
1136 dst->d023 = src->d023; 1136 dst->d023 = src->d023;
1137 dst->d024 = src->d024; 1137 dst->d024 = src->d024;
1138 1138
1139 // Try to do some simple fixups 1139 // Try to do some simple fixups
1140 if ((dst->type & D64_FMT_FLI) && (src->type & D64_FMT_FLI) == 0) 1140 if ((dst->fmt->type & D64_FMT_FLI) && (src->fmt->type & D64_FMT_FLI) == 0)
1141 { 1141 {
1142 dmMsg(1, "Upconverting multicolor to FLI.\n"); 1142 dmMsg(1, "Upconverting multicolor to FLI.\n");
1143 for (int i = 0; i < dst->nbanks; i++) 1143 for (int i = 0; i < dst->nbanks; i++)
1144 { 1144 {
1145 if (dst->color[i].data == NULL) 1145 if (dst->color[i].data == NULL)
1151 if (dst->bitmap[i].data == NULL) 1151 if (dst->bitmap[i].data == NULL)
1152 dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]); 1152 dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]);
1153 } 1153 }
1154 } 1154 }
1155 else 1155 else
1156 if ((src->type & D64_FMT_FLI) && (dst->type & D64_FMT_FLI) == 0) 1156 if ((src->fmt->type & D64_FMT_FLI) && (dst->fmt->type & D64_FMT_FLI) == 0)
1157 { 1157 {
1158 dmMsg(1, "Downconverting FLI to multicolor.\n"); 1158 dmMsg(1, "Downconverting FLI to multicolor.\n");
1159 } 1159 }
1160 1160
1161 // Do per opcode copies 1161 // Do per opcode copies