dmlib: tools/gfxconv.c comparison

comparison tools/gfxconv.c @ 1479:c4755b73b93c

Improve how input skipping is done. This, however, currently breaks skipping for non-c64 image format inputs.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 11 May 2018 02:46:59 +0300
parents	499835ba215c
children	c3eba254bcc2

comparison

equal deleted inserted replaced

-:d883b4c1cf48
+:c4755b73b93c
 }
 }
 }
-void dmDumpCharASCII(FILE *outFile, const Uint8 *buf, int *offs, int format, BOOL multicolor)
+void dmDumpCharASCII(FILE *outFile, const Uint8 *buf, const size_t offs, const int fmt, const BOOL multicolor)
 {
-int yc;
+for (size_t yc = 0; yc < C64_CHR_HEIGHT; yc++)
+{
-for (yc = 0; yc < C64_CHR_HEIGHT; yc++)
+fprintf(outFile, "%04" DM_PRIx_SIZE_T " : ", offs + yc);
-{
+dmPrintByte(outFile, buf[yc], fmt, multicolor);
-fprintf(outFile, "%04x : ", *offs);
-dmPrintByte(outFile, buf[yc], format, multicolor);
 fprintf(outFile, "\n");
-(*offs)++;
+}
 }
-}
+void dmDumpSpriteASCII(FILE *outFile, const Uint8 *buf, const size_t offs, const int fmt, BOOL multicolor)
-void dmDumpSpriteASCII(FILE *outFile, const Uint8 *buf, int *offs, int format, BOOL multicolor)
+{
-{
+size_t bufOffs, xc, yc;
-int bufOffs, xc, yc;
 for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT; yc++)
 {
-fprintf(outFile, "%04x : ", *offs);
+fprintf(outFile, "%04" DM_PRIx_SIZE_T " ", offs + bufOffs);
 for (xc = 0; xc < C64_SPR_WIDTH; xc++)
 {
-dmPrintByte(outFile, buf[bufOffs], format, multicolor);
+dmPrintByte(outFile, buf[bufOffs], fmt, multicolor);
 fprintf(outFile, " ");
 bufOffs++;
-(*offs)++;
 }
 fprintf(outFile, "\n");
 }
-(*offs)++;
 }
 int dmRemapImageColors(DMImage **pdst, const DMImage *src)
 {
 dmFree(buf);
 return ret;
 }
-int dmDumpSpritesAndChars(FILE *inFile)
+int dmDumpSpritesAndChars(const Uint8 *dataBuf, const size_t dataSize, const size_t realOffs)
 {
-int dataOffs, itemCount, outWidth, outWidthPX, outHeight;
+int ret, itemCount, outWidth, outWidthPX, outHeight;
-int ret = DMERR_OK;
+size_t offs, outSize;
-size_t bufSize;
-Uint8 *bufData;
 switch (optInFormat)
 {
 case FFMT_CHAR:
-bufSize    = C64_CHR_SIZE;
+outSize    = C64_CHR_SIZE;
 outWidth   = C64_CHR_WIDTH;
 outWidthPX = C64_CHR_WIDTH_PX;
 outHeight  = C64_CHR_HEIGHT;
 break;
 case FFMT_SPRITE:
-bufSize    = C64_SPR_SIZE;
+outSize    = C64_SPR_SIZE;
 outWidth   = C64_SPR_WIDTH;
 outWidthPX = C64_SPR_WIDTH_PX;
 outHeight  = C64_SPR_HEIGHT;
 break;
 default:
 return dmError(DMERR_INTERNAL,
 "Invalid input format %d, internal error.\n", optInFormat);
 }
-if ((bufData = dmMalloc(bufSize)) == NULL)
+offs = 0;
-{
-return dmError(DMERR_INTERNAL,
-"Could not allocate temporary buffer of %d bytes.\n", bufSize);
-}
-dataOffs = optInSkip;
 itemCount = 0;
 if (optOutFormat == FFMT_ANSI || optOutFormat == FFMT_ASCII)
 {
 BOOL error = FALSE;
 dmError(ret, "Error opening output file '%s', %d: %s\n",
 optOutFilename, ret, dmErrorStr(ret));
 goto error;
 }
-while (!feof(inFile) && !error && (optItemCount < 0 || itemCount < optItemCount))
+while (offs + outSize < dataSize && !error && (optItemCount < 0 || itemCount < optItemCount))
 {
-dmMemset(bufData, 0, bufSize);
-if (fread(bufData, 1, bufSize, inFile) != bufSize)
-{
-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:
-dmDumpCharASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
+dmDumpCharASCII(outFile, dataBuf + offs, realOffs + offs, optOutFormat, optInMulticolor);
 break;
 case FFMT_SPRITE:
-dmDumpSpriteASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
+dmDumpSpriteASCII(outFile, dataBuf + offs, realOffs + offs, optOutFormat, optInMulticolor);
 break;
 }
+offs += outSize;
 itemCount++;
 }
 fclose(outFile);
 }
 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_IFMT_PALETTE, -1);
 }
 dmSetDefaultC64Palette(outImage);
-while (!feof(inFile) && (optItemCount < 0 || itemCount < optItemCount))
+while (offs + outSize < dataSize && (optItemCount < 0 || itemCount < optItemCount))
 {
-dmMemset(bufData, 0, bufSize);
-if (fread(bufData, 1, bufSize, inFile) != bufSize)
-{
-dmErrorMsg("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
-bufSize, dataOffs);
-break;
-}
 if ((err = dmC64ConvertCSDataToImage(outImage, outX * outWidthPX, outY * outHeight,
-bufData, outWidth, outHeight, optInMulticolor, optColors)) != DMERR_OK)
+dataBuf + offs, outWidth, outHeight, optInMulticolor, optColors)) != DMERR_OK)
 {
 dmErrorMsg("Internal error in conversion of raw data to bitmap: %d.\n", err);
 break;
 }
 if (optSequential)
 {
-outFilename = dm_strdup_printf("%s%04d.%s", optOutFilename, itemCount, convFormatList[optOutFormat].fext);
+outFilename = dm_strdup_printf("%s%04d.%s",
+optOutFilename,
+itemCount,
+convFormatList[optOutFormat].fext);
 if (outFilename == NULL)
 {
 dmErrorMsg("Could not allocate memory for filename template?\n");
 goto error;
 }
 outX = 0;
 outY++;
 }
 }
+offs += outSize;
 itemCount++;
 }
 if (!optSequential)
 {
 "Sequential output not supported for spr/char -> bitmap conversion.\n");
 goto error;
 }
 }
-dmFree(bufData);
+ret = DMERR_OK;
-return DMERR_OK;
 error:
-dmFree(bufData);
 return ret;
 }
 int main(int argc, char *argv[])
 {
 FILE *inFile = NULL;
 const DMC64ImageFormat *inC64Fmt = NULL;
 DMC64Image *inC64Image = NULL;
-Uint8 *dataBuf = NULL;
+Uint8 *dataBuf = NULL, *dataBufOrig = NULL;
-size_t dataSize;
+size_t dataSize, dataSizeOrig;
 int i;
 // Default colors
 for (i = 0; i < C64_MAX_COLORS; i++)
 optColors[i] = i;
 dmErrorMsg("Standard input cannot be used without specifying input format.\n");
 dmErrorMsg("Perhaps you should try using --help\n");
 goto error;
 }
 inFile = stdin;
+optInFilename = "stdin";
 }
 else
 if ((inFile = fopen(optInFilename, "rb")) == NULL)
 {
 int res = dmGetErrno();
 dmErrorMsg("Error opening input file '%s', %d: %s\n",
 optInFilename, res, dmErrorStr(res));
 goto error;
 }
-if (dmReadDataFile(inFile, NULL, &dataBuf, &dataSize) != 0)
+// Read the input ..
+dmMsg(1, "Reading input from '%s'.\n", optInFilename);
+if (dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig) != 0)
 goto error;
+// Check and compute the input skip
+if (optInSkip > dataSizeOrig)
+{
+dmErrorMsg("Input skip value %d is larger than input size %d.\n",
+optInSkip, dataSizeOrig);
+goto error;
+}
+dataBuf = dataBufOrig + optInSkip;
+dataSize = dataSizeOrig - optInSkip;
+// Perform probing, if required
 if (optInFormat == FFMT_AUTO || optInFormat == FFMT_BITMAP)
 {
 // Probe for format
 const DMC64ImageFormat *forced = NULL;
 int res;
 {
 dmErrorMsg("No input format specified, and could not be determined automatically.\n");
 exit(1);
 }
-// Skip, if needed
-if (fseek(inFile, optInSkip, SEEK_SET) != 0)
-{
-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)
 {
 switch (optInFormat)
 {
 case FFMT_SPRITE:
 case FFMT_CHAR:
-dmDumpSpritesAndChars(inFile);
+dmDumpSpritesAndChars(dataBuf, dataSize, optInSkip);
 break;
 case FFMT_BITMAP:
 {
 DMImage *outImage = NULL;
 error:
 if (inFile != NULL)
 fclose(inFile);
-dmFree(dataBuf);
+dmFree(dataBufOrig);
 dmC64ImageFree(inC64Image);
 return 0;
 }

Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 1479:c4755b73b93c