2c5312fd12
The 8-bit-per-sample image I/O modules have always been built with BMP, GIF, PBMPLUS, and Targa support, and the 12-bit-per-sample image I/O modules have always been built with only GIF and PBMPLUS support. In libjpeg-turbo 2.1.x and prior, cjpeg and djpeg were built with the same image format support as the image I/O modules. However, because of the multi-precision feature introduced in libjpeg-turbo 3.0.x, cjpeg and djpeg are now always built with support for all image formats. Thus, the error message table compiled into cjpeg and djpeg was a superset of the error message table compiled into the 12-bit-per-sample and 16-bit-per-sample image I/O modules. If, for example, the 12-bit-per-sample PPM writer threw JERR_PPM_COLORSPACE (== 15, because it was built with only GIF and PBMPLUS support), then djpeg interpreted that as JERR_GIF_COLORSPACE (== 15, because it was built with support for all image formats.) There was no chance of a buffer overrun, since the error message table lookup was performed against the table compiled into cjpeg and djpeg, which contained all possible entries. However, this issue caused an incorrect error message to be displayed by cjpeg or djpeg if a 12-bit-per-sample or 16-bit-per-sample image I/O module threw an error. This commit simply removes the *_SUPPORTED #ifdefs from cderror.h so that all image I/O error messages are always included in every instance of the image I/O error message table. Note that a similar issue could have also occurred with the 12-bit-per-sample and 16-bit-per-sample TurboJPEG image I/O functions, since the 12-bit-per-sample and 16-bit-per-sample image I/O modules supporting those functions are built with only PBMPLUS support whereas the library as a whole is built with BMP and PBMPLUS support.
115 lines
4.4 KiB
C
115 lines
4.4 KiB
C
/*
|
|
* cderror.h
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1994-1997, Thomas G. Lane.
|
|
* Modified 2009-2017 by Guido Vollbeding.
|
|
* libjpeg-turbo Modifications:
|
|
* Copyright (C) 2021, D. R. Commander.
|
|
* For conditions of distribution and use, see the accompanying README.ijg
|
|
* file.
|
|
*
|
|
* This file defines the error and message codes for the cjpeg/djpeg
|
|
* applications. These strings are not needed as part of the JPEG library
|
|
* proper.
|
|
* Edit this file to add new codes, or to translate the message strings to
|
|
* some other language.
|
|
*/
|
|
|
|
/*
|
|
* To define the enum list of message codes, include this file without
|
|
* defining macro JMESSAGE. To create a message string table, include it
|
|
* again with a suitable JMESSAGE definition (see jerror.c for an example).
|
|
*/
|
|
#ifndef JMESSAGE
|
|
#ifndef CDERROR_H
|
|
#define CDERROR_H
|
|
/* First time through, define the enum list */
|
|
#define JMAKE_ENUM_LIST
|
|
#else
|
|
/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
|
|
#define JMESSAGE(code, string)
|
|
#endif /* CDERROR_H */
|
|
#endif /* JMESSAGE */
|
|
|
|
#ifdef JMAKE_ENUM_LIST
|
|
|
|
typedef enum {
|
|
|
|
#define JMESSAGE(code, string) code,
|
|
|
|
#endif /* JMAKE_ENUM_LIST */
|
|
|
|
JMESSAGE(JMSG_FIRSTADDONCODE = 1000, NULL) /* Must be first entry! */
|
|
|
|
JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")
|
|
JMESSAGE(JERR_BMP_BADDEPTH, "Only 8-, 24-, and 32-bit BMP files are supported")
|
|
JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
|
|
JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")
|
|
JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")
|
|
JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")
|
|
JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image")
|
|
JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")
|
|
JMESSAGE(JERR_BMP_OUTOFRANGE, "Numeric value out of range in BMP file")
|
|
JMESSAGE(JTRC_BMP, "%ux%u %d-bit BMP image")
|
|
JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
|
|
JMESSAGE(JTRC_BMP_OS2, "%ux%u %d-bit OS2 BMP image")
|
|
JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")
|
|
|
|
JMESSAGE(JERR_GIF_BUG, "GIF output got confused")
|
|
JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
|
|
JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")
|
|
JMESSAGE(JERR_GIF_EMPTY, "Empty GIF image")
|
|
JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")
|
|
JMESSAGE(JERR_GIF_NOT, "Not a GIF file")
|
|
JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")
|
|
JMESSAGE(JTRC_GIF_BADVERSION,
|
|
"Warning: unexpected GIF version number '%c%c%c'")
|
|
JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x")
|
|
JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input")
|
|
JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")
|
|
JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring")
|
|
JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image")
|
|
JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits")
|
|
|
|
JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB")
|
|
JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file")
|
|
JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file")
|
|
JMESSAGE(JERR_PPM_OUTOFRANGE, "Numeric value out of range in PPM file")
|
|
JMESSAGE(JTRC_PGM, "%ux%u PGM image")
|
|
JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image")
|
|
JMESSAGE(JTRC_PPM, "%ux%u PPM image")
|
|
JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image")
|
|
|
|
JMESSAGE(JERR_TGA_BADCMAP, "Unsupported Targa colormap format")
|
|
JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file")
|
|
JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB")
|
|
JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image")
|
|
JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image")
|
|
JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image")
|
|
JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")
|
|
|
|
JMESSAGE(JERR_BAD_CMAP_FILE,
|
|
"Color map file is invalid or of unsupported format")
|
|
JMESSAGE(JERR_TOO_MANY_COLORS,
|
|
"Output file format cannot handle %d colormap entries")
|
|
JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")
|
|
#ifdef TARGA_SUPPORTED
|
|
JMESSAGE(JERR_UNKNOWN_FORMAT,
|
|
"Unrecognized input file format --- perhaps you need -targa")
|
|
#else
|
|
JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")
|
|
#endif
|
|
JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")
|
|
|
|
#ifdef JMAKE_ENUM_LIST
|
|
|
|
JMSG_LASTADDONCODE
|
|
} ADDON_MESSAGE_CODE;
|
|
|
|
#undef JMAKE_ENUM_LIST
|
|
#endif /* JMAKE_ENUM_LIST */
|
|
|
|
/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
|
|
#undef JMESSAGE
|