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

Side by Side Diff: third_party/libjpeg_turbo/cderror.h

Issue 7554002: Updates libjpeg-turbo to 1.1.90 (r677) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « third_party/libjpeg_turbo/bmp.c ('k') | third_party/libjpeg_turbo/cdjpeg.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * This file is part of the Independent JPEG Group's software. 6 * This file is part of the Independent JPEG Group's software.
6 * For conditions of distribution and use, see the accompanying README file. 7 * For conditions of distribution and use, see the accompanying README file.
7 * 8 *
8 * This file defines the error and message codes for the cjpeg/djpeg 9 * This file defines the error and message codes for the cjpeg/djpeg
9 * applications. These strings are not needed as part of the JPEG library 10 * applications. These strings are not needed as part of the JPEG library
10 * proper. 11 * proper.
11 * Edit this file to add new codes, or to translate the message strings to 12 * Edit this file to add new codes, or to translate the message strings to
12 * some other language. 13 * some other language.
13 */ 14 */
14 15
(...skipping 23 matching lines...) Expand all
38 39
39 JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */ 40 JMESSAGE(JMSG_FIRSTADDONCODE=1000, NULL) /* Must be first entry! */
40 41
41 #ifdef BMP_SUPPORTED 42 #ifdef BMP_SUPPORTED
42 JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format") 43 JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")
43 JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported") 44 JMESSAGE(JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported")
44 JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length") 45 JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
45 JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1") 46 JMESSAGE(JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1")
46 JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB") 47 JMESSAGE(JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB")
47 JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported") 48 JMESSAGE(JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported")
49 JMESSAGE(JERR_BMP_EMPTY, "Empty BMP image")
48 JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM") 50 JMESSAGE(JERR_BMP_NOT, "Not a BMP file - does not start with BM")
49 JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image") 51 JMESSAGE(JTRC_BMP, "%ux%u 24-bit BMP image")
50 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image") 52 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
51 JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image") 53 JMESSAGE(JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image")
52 JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image") 54 JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")
53 #endif /* BMP_SUPPORTED */ 55 #endif /* BMP_SUPPORTED */
54 56
55 #ifdef GIF_SUPPORTED 57 #ifdef GIF_SUPPORTED
56 JMESSAGE(JERR_GIF_BUG, "GIF output got confused") 58 JMESSAGE(JERR_GIF_BUG, "GIF output got confused")
57 JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d") 59 JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #ifdef JMAKE_ENUM_LIST 125 #ifdef JMAKE_ENUM_LIST
124 126
125 JMSG_LASTADDONCODE 127 JMSG_LASTADDONCODE
126 } ADDON_MESSAGE_CODE; 128 } ADDON_MESSAGE_CODE;
127 129
128 #undef JMAKE_ENUM_LIST 130 #undef JMAKE_ENUM_LIST
129 #endif /* JMAKE_ENUM_LIST */ 131 #endif /* JMAKE_ENUM_LIST */
130 132
131 /* Zap JMESSAGE macro so that future re-inclusions do nothing by default */ 133 /* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
132 #undef JMESSAGE 134 #undef JMESSAGE
OLDNEW
« no previous file with comments | « third_party/libjpeg_turbo/bmp.c ('k') | third_party/libjpeg_turbo/cdjpeg.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698