dmlib: tools/gfxconv.c comparison

comparison tools/gfxconv.c @ 1235:5b8245e5f785

Remove trailing whitespace.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 06 Mar 2015 13:40:47 +0200
parents	848a88ce7a57
children	5206e3d4e6b7

comparison

equal deleted inserted replaced

-:beae399c6473
+:5b8245e5f785
 printf(
 "Available input/output formats:\n"
 "  Ext | I | O | Description\n"
 "------+---+---+-----------------------------------------------\n"
 );
 for (i = 0; i < nconvFormatList; i++)
 {
 DMConvFormat *fmt = &convFormatList[i];
 printf("%-5s | %c | %c | %s\n",
 fmt->fext ? fmt->fext : "",
 dmErrorMsg("Invalid %s value '%s', could not parse source value '%s'.\n", msg, popt, opt);
 goto error;
 }
 value->triplet = FALSE;
 }
 // Trim whitespace
 split++;
 while (*split && isspace(*split)) split++;
 // Parse destination value
 if (!dmGetIntVal(split, &value->to))
 {
 dmErrorMsg("Invalid %s value '%s', could not parse destination value '%s'.\n", msg, popt, split);
 goto error;
 {
 dmErrorMsg("Invalid %s value '%s', could not parse.\n", msg, opt);
 return FALSE;
 }
 }
 return TRUE;
 }
 BOOL dmParseMapOptionString(char *opt, void *values, int *nvalues, const int nmax, const BOOL requireIndex, const char *msg)
 break;
 start = end + 1;
 }
 return TRUE;
 }
 int dmParseColorRemapFile(const char *filename, DMMapValue *values, int *nvalue, const int nmax)
 {
 while (fgets(line, sizeof(line), fp))
 {
 char *start = line;
 while (*start && isspace(*start)) start++;
 if (*start != 0 && *start != ';')
 {
 if (!dmParseMapOptionMapItem(line, &values[*nvalue], nmax, "mapping file"))
 goto error;
 else
 case 'i': optInFormat = FFMT_IMAGE; break;
 default:
 dmErrorMsg("Invalid input format '%s'.\n", optArg);
 return FALSE;
 }
 char *tmp = strchr(optArg, ':');
 if (tmp != NULL)
 {
 tmp++;
 switch (optInFormat)
 dmErrorMsg("Invalid input subformat for sprite/char: '%s', should be 'mc' or 'sc'.\n",
 tmp);
 return FALSE;
 }
 break;
 case FFMT_BITMAP:
 if (!dmGetC64FormatByExt(tmp, &optInFormat, &optInSubFormat))
 {
 dmErrorMsg("Invalid bitmap subformat '%s', see format list for valid bformats.\n",
 tmp);
 break;
 }
 }
 }
 break;
 case 2:
 optInMulticolor = TRUE;
 break;
 case 3:
 optOutFilename = optArg;
 break;
 case 4:
 if (!dmGetIntVal(optArg, &optInSkip))
 {
 dmErrorMsg("Invalid skip value argument '%s'.\n", optArg);
 return FALSE;
 void dmPrintByte(FILE *out, int byte, int format, BOOL multicolor)
 {
 int i;
 if (multicolor)
 {
 for (i = DM_ASC_NBITS; i; i -= 2)
 {
 int val = (byte & (3ULL << (i - 2))) >> (i - 2);
 mapping[n] = map->to;
 mapped[map->to] = TRUE;
 found = TRUE;
 }
 }
 if (!found)
 {
 dmMsg(3, "No RGBA match found for map index %d, #%02x%02x%02x%02x\n",
 index,
 map->color.r, map->color.g, map->color.b, map->color.a);
 mapping[map->from] = map->to;
 mapped[map->to] = TRUE;
 }
 }
 // Fill in the rest
 if (optRemapRemove)
 {
 dmMsg(2, "Removing unused colors.\n");
 for (index = 0; index < image->ncolors; index++)
 for (index = 0; index < image->ncolors; index++)
 {
 if (mapping[index] + 1 > ncolors)
 ncolors = mapping[index] + 1;
 }
 // Copy palette entries
 for (index = 0; index < image->ncolors; index++)
 {
 if (mapping[index] >= 0)
 {
 case IMGFMT_RAW:
 case IMGFMT_ARAW:
 {
 FILE *fp;
 char *dataFilename;
 // Form data file filename
 dataFilename = dm_strdup_fext(filename, "%s.inc");
 if (dataFilename == NULL)
 return DMERR_MALLOC;
 {
 dmErrorMsg("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
 bufSize, dataOffs);
 error = TRUE;
 }
 fprintf(outFile, "---- : -------------- #%d\n", itemCount);
 switch (optInFormat)
 {
 case FFMT_CHAR:
 if (optItemCount <= 0)
 {
 dmErrorMsg("Single-image output requires count to be set (-n).\n");
 goto error;
 }
 outIWidth = optPlanedWidth;
 outIHeight = (optItemCount / optPlanedWidth);
 if (optItemCount % optPlanedWidth)
 outIHeight++;
 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight);
 }
 outImage->constpal = TRUE;
 outImage->pal      = dmC64Palette;
 outImage->ncolors  = C64_NCOLORS;
 outImage->ctransp  = 255;
 while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount))
 {
 dmMemset(bufData, 0, bufSize);
 if (fread(bufData, 1, bufSize, inFile) != bufSize)
 if (outFilename == NULL)
 {
 dmErrorMsg("Could not allocate memory for filename template?\n");
 goto error;
 }
 ret = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
 if (ret != DMERR_OK)
 {
 dmErrorMsg("Error writing output image, %d: %s.\n",
 ret, dmErrorStr(ret));
 {
 outX = 0;
 outY++;
 }
 }
 itemCount++;
 }
 if (!optSequential)
 {
 {
 dmError(ret, "Error writing output image, %d: %s.\n",
 ret, dmErrorStr(ret));
 }
 }
 dmImageFree(outImage);
 }
 else
 if (optOutFormat == FFMT_BITMAP)
 {
 if (forced == NULL && cfmt != NULL)
 {
 dmMsg(1,"Probed %s format image, type %d, %s\n",
 cfmt->name, cfmt->type, cfmt->fext);
 }
 if (res == DMERR_OK)
 optInFormat = FFMT_BITMAP;
 else
 {
 dmErrorMsg("Could not decode input image.\n");
 int res = dmGetErrno();
 dmErrorMsg("Could not seek to file position %d (0x%x): %s\n",
 optInSkip, optInSkip, dmErrorStr(res));
 goto error;
 }
 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
 if (inFormat != -1 && outFormat != -1)
 {
 char *inFmtName = convFormatList[inFormat].name,
 *inFmtExt = convFormatList[inFormat].fext,
 *outFmtName = convFormatList[outFormat].name,
 {
 case FFMT_SPRITE:
 case FFMT_CHAR:
 dmDumpSpritesAndChars(inFile);
 break;
 case FFMT_BITMAP:
 {
 DMImage *outImage = NULL;
 int res = DMERR_OK;
 default:
 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n");
 break;
 }
 dmImageFree(outImage);
 }
 break;
 case FFMT_IMAGE:
 else
 dmErrorMsg("Unsupported input image format for bitmap/image conversion.\n");
 if (res != DMERR_OK || outImage == NULL)
 break;
 switch (optOutFormat)
 {
 case FFMT_IMAGE:
 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
 break;
 if (res != DMERR_OK)
 {
 dmErrorMsg("Error writing output (%s), probably unsupported output format for bitmap/image conversion.\n",
 dmErrorStr(res));
 }
 dmImageFree(outImage);
 }
 break;
 }

Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 1235:5b8245e5f785