comparison tools/gfxconv.c @ 2214:f8bba7a82ec2

Rename variable.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 14 Jun 2019 06:04:15 +0300
parents 90ec1ec89c56
children 69e868af764c
comparison
equal deleted inserted replaced
2213:b1e392da8346 2214:f8bba7a82ec2
135 optScaleMode = SCALE_AUTO; 135 optScaleMode = SCALE_AUTO;
136 DMMapValue optRemapTable[DM_MAX_COLORS]; 136 DMMapValue optRemapTable[DM_MAX_COLORS];
137 int optColorMap[D64_NCOLORS]; 137 int optColorMap[D64_NCOLORS];
138 char *optCharROMFilename = NULL; 138 char *optCharROMFilename = NULL;
139 DMC64Palette *optC64Palette = NULL; 139 DMC64Palette *optC64Palette = NULL;
140 char *optC64PaletteFile = NULL; 140 char *optPaletteFile = NULL;
141 141
142 142
143 DMImageWriteSpec optSpec = 143 DMImageWriteSpec optSpec =
144 { 144 {
145 .scaleX = 1, 145 .scaleX = 1,
963 case 21: 963 case 21:
964 optCharROMFilename = optArg; 964 optCharROMFilename = optArg;
965 break; 965 break;
966 966
967 case 22: 967 case 22:
968 return argHandleC64PaletteOption(optArg, &optC64Palette, &optC64PaletteFile); 968 return argHandleC64PaletteOption(optArg, &optC64Palette, &optPaletteFile);
969 969
970 default: 970 default:
971 dmErrorMsg("Unimplemented option argument '%s'.\n", currArg); 971 dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
972 return FALSE; 972 return FALSE;
973 } 973 }
2150 optSpec.scaleY *= scaleY; 2150 optSpec.scaleY *= scaleY;
2151 break; 2151 break;
2152 } 2152 }
2153 } 2153 }
2154 2154
2155 if (optC64PaletteFile != NULL) 2155 if (optPaletteFile != NULL)
2156 { 2156 {
2157 if ((res = dmHandleExternalPalette(optC64PaletteFile, &optC64Spec.pal)) != DMERR_OK) 2157 if ((res = dmHandleExternalPalette(optPaletteFile, &optC64Spec.pal)) != DMERR_OK)
2158 goto exit; 2158 goto exit;
2159 } 2159 }
2160 else 2160 else
2161 { 2161 {
2162 // No palette file specified, use internal palette 2162 // No palette file specified, use internal palette