Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: cderror.h

Issue 1934113002: Update libjpeg_turbo to 1.4.90 from https://github.com/libjpeg-turbo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * cderror.h 2 * cderror.h
3 * 3 *
4 * Copyright (C) 1994-1997, Thomas G. Lane. 4 * Copyright (C) 1994-1997, Thomas G. Lane.
5 * Modified 2009 by Guido Vollbeding. 5 * Modified 2009 by Guido Vollbeding.
6 * This file is part of the Independent JPEG Group's software. 6 * This file is part of the Independent JPEG Group's software.
7 * For conditions of distribution and use, see the accompanying README file. 7 * For conditions of distribution and use, see the accompanying README.ijg
8 * file.
8 * 9 *
9 * This file defines the error and message codes for the cjpeg/djpeg 10 * This file defines the error and message codes for the cjpeg/djpeg
10 * applications. These strings are not needed as part of the JPEG library 11 * applications. These strings are not needed as part of the JPEG library
11 * proper. 12 * proper.
12 * Edit this file to add new codes, or to translate the message strings to 13 * Edit this file to add new codes, or to translate the message strings to
13 * some other language. 14 * some other language.
14 */ 15 */
15 16
16 /* 17 /*
17 * To define the enum list of message codes, include this file without 18 * To define the enum list of message codes, include this file without
18 * defining macro JMESSAGE. To create a message string table, include it 19 * defining macro JMESSAGE. To create a message string table, include it
19 * again with a suitable JMESSAGE definition (see jerror.c for an example). 20 * again with a suitable JMESSAGE definition (see jerror.c for an example).
20 */ 21 */
21 #ifndef JMESSAGE 22 #ifndef JMESSAGE
22 #ifndef CDERROR_H 23 #ifndef CDERROR_H
23 #define CDERROR_H 24 #define CDERROR_H
24 /* First time through, define the enum list */ 25 /* First time through, define the enum list */
25 #define JMAKE_ENUM_LIST 26 #define JMAKE_ENUM_LIST
26 #else 27 #else
27 /* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */ 28 /* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
28 #define JMESSAGE(code,string) 29 #define JMESSAGE(code,string)
29 #endif /* CDERROR_H */ 30 #endif /* CDERROR_H */
30 #endif /* JMESSAGE */ 31 #endif /* JMESSAGE */
31 32
32 #ifdef JMAKE_ENUM_LIST 33 #ifdef JMAKE_ENUM_LIST
33 34
34 typedef enum { 35 typedef enum {
35 36
36 #define JMESSAGE(code,string)» code , 37 #define JMESSAGE(code,string) code ,
37 38
38 #endif /* JMAKE_ENUM_LIST */ 39 #endif /* JMAKE_ENUM_LIST */
39 40
40 JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */ 41 JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */
41 42
42 #ifdef BMP_SUPPORTED 43 #ifdef BMP_SUPPORTED
43 JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format") 44 JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")
44 JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported") 45 JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported")
45 JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length") 46 JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
46 JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1") 47 JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")
47 JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB") 48 JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")
48 JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported") 49 JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")
49 JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image") 50 JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image")
50 JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM") 51 JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")
51 JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image") 52 JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image")
52 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image") 53 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
53 JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image") 54 JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image")
54 JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image") 55 JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")
55 #endif /* BMP_SUPPORTED */ 56 #endif /* BMP_SUPPORTED */
56 57
57 #ifdef GIF_SUPPORTED 58 #ifdef GIF_SUPPORTED
58 JMESSAGE(JERR_GIF_BUG, "GIF output got confused") 59 JMESSAGE(JERR_GIF_BUG, "GIF output got confused")
59 JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d") 60 JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
60 JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB") 61 JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")
61 JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file") 62 JMESSAGE(JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file")
62 JMESSAGE(JERR_GIF_NOT, "Not a GIF file") 63 JMESSAGE(JERR_GIF_NOT, "Not a GIF file")
63 JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image") 64 JMESSAGE(JTRC_GIF, "%ux%ux%d GIF image")
64 JMESSAGE(JTRC_GIF_BADVERSION, 65 JMESSAGE(JTRC_GIF_BADVERSION,
65 » "Warning: unexpected GIF version number '%c%c%c'") 66 "Warning: unexpected GIF version number '%c%c%c'")
66 JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x") 67 JMESSAGE(JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x")
67 JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input") 68 JMESSAGE(JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input")
68 JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file") 69 JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")
69 JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring") 70 JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring")
70 JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image") 71 JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image")
71 JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits") 72 JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits")
72 #endif /* GIF_SUPPORTED */ 73 #endif /* GIF_SUPPORTED */
73 74
74 #ifdef PPM_SUPPORTED 75 #ifdef PPM_SUPPORTED
75 JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB") 76 JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB")
76 JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file") 77 JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file")
78 JMESSAGE(JERR_PPM_TOOLARGE, "Integer value too large in PPM file")
77 JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file") 79 JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file")
78 JMESSAGE(JTRC_PGM, "%ux%u PGM image") 80 JMESSAGE(JTRC_PGM, "%ux%u PGM image")
79 JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image") 81 JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image")
80 JMESSAGE(JTRC_PPM, "%ux%u PPM image") 82 JMESSAGE(JTRC_PPM, "%ux%u PPM image")
81 JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image") 83 JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image")
82 #endif /* PPM_SUPPORTED */ 84 #endif /* PPM_SUPPORTED */
83 85
84 #ifdef RLE_SUPPORTED 86 #ifdef RLE_SUPPORTED
85 JMESSAGE(JERR_RLE_BADERROR, "Bogus error code from RLE library") 87 JMESSAGE(JERR_RLE_BADERROR, "Bogus error code from RLE library")
86 JMESSAGE(JERR_RLE_COLORSPACE, "RLE output must be grayscale or RGB") 88 JMESSAGE(JERR_RLE_COLORSPACE, "RLE output must be grayscale or RGB")
(...skipping 16 matching lines...) Expand all
103 JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file") 105 JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file")
104 JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB") 106 JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB")
105 JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image") 107 JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image")
106 JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image") 108 JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image")
107 JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image") 109 JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image")
108 #else 110 #else
109 JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled") 111 JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")
110 #endif /* TARGA_SUPPORTED */ 112 #endif /* TARGA_SUPPORTED */
111 113
112 JMESSAGE(JERR_BAD_CMAP_FILE, 114 JMESSAGE(JERR_BAD_CMAP_FILE,
113 » "Color map file is invalid or of unsupported format") 115 "Color map file is invalid or of unsupported format")
114 JMESSAGE(JERR_TOO_MANY_COLORS, 116 JMESSAGE(JERR_TOO_MANY_COLORS,
115 » "Output file format cannot handle %d colormap entries") 117 "Output file format cannot handle %d colormap entries")
116 JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed") 118 JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")
117 #ifdef TARGA_SUPPORTED 119 #ifdef TARGA_SUPPORTED
118 JMESSAGE(JERR_UNKNOWN_FORMAT, 120 JMESSAGE(JERR_UNKNOWN_FORMAT,
119 » "Unrecognized input file format --- perhaps you need -targa") 121 "Unrecognized input file format --- perhaps you need -targa")
120 #else 122 #else
121 JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format") 123 JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")
122 #endif 124 #endif
123 JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format") 125 JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")
124 126
125 #ifdef JMAKE_ENUM_LIST 127 #ifdef JMAKE_ENUM_LIST
126 128
127 JMSG_LASTADDONCODE 129 JMSG_LASTADDONCODE
128 } ADDON_MESSAGE_CODE; 130 } ADDON_MESSAGE_CODE;
129 131
130 #undef JMAKE_ENUM_LIST 132 #undef JMAKE_ENUM_LIST
131 #endif /* JMAKE_ENUM_LIST */ 133 #endif /* JMAKE_ENUM_LIST */
132 134
133 /* Zap JMESSAGE macro so that future re-inclusions do nothing by default */ 135 /* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
134 #undef JMESSAGE 136 #undef JMESSAGE
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698