Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 2387:68efae89c034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some error messages in gfxconv.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 09 Jan 2020 19:59:00 +0200
parents 36edd316184a
children 647671a9a0b8
comparison
equal deleted inserted replaced
2386:f543475ea0eb 2387:68efae89c034
550 int res = DMERR_OK; 550 int res = DMERR_OK;
551 551
552 if ((fp = fopen(filename, "r")) == NULL) 552 if ((fp = fopen(filename, "r")) == NULL)
553 { 553 {
554 res = dmGetErrno(); 554 res = dmGetErrno();
555 dmError(res, "Could not open color remap file '%s' for reading, %d: %s\n", 555 dmError(res, "Could not open color remap file '%s' for reading: %s.\n",
556 res, dmErrorStr(res)); 556 dmErrorStr(res));
557 return res; 557 return res;
558 } 558 }
559 559
560 while (fgets(line, sizeof(line), fp)) 560 while (fgets(line, sizeof(line), fp))
561 { 561 {
1704 } 1704 }
1705 1705
1706 if ((outFile = fopen(filename, "wb")) == NULL) 1706 if ((outFile = fopen(filename, "wb")) == NULL)
1707 { 1707 {
1708 ret = dmGetErrno(); 1708 ret = dmGetErrno();
1709 dmErrorMsg("Could not open '%s' for writing, %d: %s.\n", 1709 dmErrorMsg("Could not open '%s' for writing: %s.\n",
1710 filename, ret, dmErrorStr(ret)); 1710 filename, dmErrorStr(ret));
1711 goto error; 1711 goto error;
1712 } 1712 }
1713 1713
1714 if ((tmpBuf = dmMalloc(outBufSize)) == NULL) 1714 if ((tmpBuf = dmMalloc(outBufSize)) == NULL)
1715 { 1715 {
1749 } 1749 }
1750 1750
1751 if (!dm_fwrite_str(outFile, tmpBuf, outBufSize)) 1751 if (!dm_fwrite_str(outFile, tmpBuf, outBufSize))
1752 { 1752 {
1753 ret = dmGetErrno(); 1753 ret = dmGetErrno();
1754 dmError(ret, "Error writing data block %d,%d to '%s', %d: %s\n", 1754 dmError(ret, "Error writing data block %d,%d to '%s': %s.\n",
1755 bx, by, filename, ret, dmErrorStr(ret)); 1755 bx, by, filename, dmErrorStr(ret));
1756 goto error; 1756 goto error;
1757 } 1757 }
1758 } 1758 }
1759 1759
1760 error: 1760 error:
1806 outFile = stdout; 1806 outFile = stdout;
1807 else 1807 else
1808 if ((outFile = fopen(optOutFilename, "w")) == NULL) 1808 if ((outFile = fopen(optOutFilename, "w")) == NULL)
1809 { 1809 {
1810 ret = dmGetErrno(); 1810 ret = dmGetErrno();
1811 dmError(ret, "Error opening output file '%s': %s\n", 1811 dmError(ret, "Error opening output file '%s': %s.\n",
1812 optOutFilename, dmErrorStr(ret)); 1812 optOutFilename, dmErrorStr(ret));
1813 goto error; 1813 goto error;
1814 } 1814 }
1815 1815
1816 while (offs + outSize < dataSize && !error && (optItemCount < 0 || itemCount < optItemCount)) 1816 while (offs + outSize < dataSize && !error && (optItemCount < 0 || itemCount < optItemCount))
2029 } 2029 }
2030 else 2030 else
2031 if ((inFile = fopen(optInFilename, "rb")) == NULL) 2031 if ((inFile = fopen(optInFilename, "rb")) == NULL)
2032 { 2032 {
2033 res = dmGetErrno(); 2033 res = dmGetErrno();
2034 dmErrorMsg("Error opening input file '%s', %d: %s\n", 2034 dmErrorMsg("Error opening input file '%s': %s\n",
2035 optInFilename, res, dmErrorStr(res)); 2035 optInFilename, dmErrorStr(res));
2036 goto exit; 2036 goto exit;
2037 } 2037 }
2038 2038
2039 // Determine output format, if not specified 2039 // Determine output format, if not specified
2040 if (optOutType == FFMT_AUTO && optOutFilename != NULL) 2040 if (optOutType == FFMT_AUTO && optOutFilename != NULL)
2209 2209
2210 optC64Spec.cpal = optC64Palette; 2210 optC64Spec.cpal = optC64Palette;
2211 2211
2212 if ((res = dmC64PaletteFromC64Palette(&optC64Spec.pal, optC64Palette, FALSE)) != DMERR_OK) 2212 if ((res = dmC64PaletteFromC64Palette(&optC64Spec.pal, optC64Palette, FALSE)) != DMERR_OK)
2213 { 2213 {
2214 dmErrorMsg("Could not setup palette: %s\n", 2214 dmErrorMsg("Could not setup palette: %s.\n",
2215 dmErrorStr(res)); 2215 dmErrorStr(res));
2216 goto exit; 2216 goto exit;
2217 } 2217 }
2218 } 2218 }
2219 2219
2261 // Convert the image 2261 // Convert the image
2262 res = dmC64ConvertBMP2Image(&outImage, inC64Image, &optC64Spec); 2262 res = dmC64ConvertBMP2Image(&outImage, inC64Image, &optC64Spec);
2263 2263
2264 if (res != DMERR_OK || outImage == NULL) 2264 if (res != DMERR_OK || outImage == NULL)
2265 { 2265 {
2266 dmErrorMsg("Error in bitmap to image conversion: %s\n", 2266 dmErrorMsg("Error in bitmap to image conversion: %s.\n",
2267 dmErrorStr(res)); 2267 dmErrorStr(res));
2268 goto exit; 2268 goto exit;
2269 } 2269 }
2270 2270
2271 switch (optOutType) 2271 switch (optOutType)
2356 &dmC64ImageFormats[optOutFormat], &optC64Spec); 2356 &dmC64ImageFormats[optOutFormat], &optC64Spec);
2357 2357
2358 if (res != DMERR_OK || tmpC64Image == NULL) 2358 if (res != DMERR_OK || tmpC64Image == NULL)
2359 { 2359 {
2360 dmC64ImageFree(tmpC64Image); 2360 dmC64ImageFree(tmpC64Image);
2361 dmErrorMsg("Error in image to bitmap conversion: %s\n", 2361 dmErrorMsg("Error in image to bitmap conversion: %s.\n",
2362 dmErrorStr(res)); 2362 dmErrorStr(res));
2363 goto exit; 2363 goto exit;
2364 } 2364 }
2365 2365
2366 if ((res = dmConvertC64Bitmap(&outC64Image, tmpC64Image, 2366 if ((res = dmConvertC64Bitmap(&outC64Image, tmpC64Image,
2367 &dmC64ImageFormats[optOutFormat], &dmC64ImageFormats[optOutFormat])) != DMERR_OK) 2367 &dmC64ImageFormats[optOutFormat], &dmC64ImageFormats[optOutFormat])) != DMERR_OK)
2368 { 2368 {
2369 dmC64ImageFree(tmpC64Image); 2369 dmC64ImageFree(tmpC64Image);
2370 dmErrorMsg("Error in bitmap format conversion: %s\n", 2370 dmErrorMsg("Error in bitmap format conversion: %s.\n",
2371 dmErrorStr(res)); 2371 dmErrorStr(res));
2372 goto exit; 2372 goto exit;
2373 } 2373 }
2374 2374
2375 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]); 2375 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);