Index: third_party/libjpeg_turbo/jerror.h |
=================================================================== |
--- third_party/libjpeg_turbo/jerror.h (revision 95020) |
+++ third_party/libjpeg_turbo/jerror.h (working copy) |
@@ -2,6 +2,7 @@ |
* jerror.h |
* |
* Copyright (C) 1994-1997, Thomas G. Lane. |
+ * Modified 1997-2009 by Guido Vollbeding. |
* This file is part of the Independent JPEG Group's software. |
* For conditions of distribution and use, see the accompanying README file. |
* |
@@ -39,14 +40,23 @@ |
JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */ |
/* For maintenance convenience, list is alphabetical by message code name */ |
+#if JPEG_LIB_VERSION < 70 |
JMESSAGE(JERR_ARITH_NOTIMPL, |
- "Sorry, there are legal restrictions on arithmetic coding") |
+ "Sorry, arithmetic coding is not implemented") |
+#endif |
JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix") |
JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix") |
JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode") |
JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS") |
+#if JPEG_LIB_VERSION >= 70 |
+JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request") |
+#endif |
JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range") |
JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported") |
+#if JPEG_LIB_VERSION >= 70 |
+JMESSAGE(JERR_BAD_DROP_SAMPLING, |
+ "Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c") |
+#endif |
JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition") |
JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace") |
JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace") |
@@ -93,6 +103,9 @@ |
JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change") |
JMESSAGE(JERR_NOTIMPL, "Not implemented yet") |
JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time") |
+#if JPEG_LIB_VERSION >= 70 |
+JMESSAGE(JERR_NO_ARITH_TABLE, "Arithmetic table 0x%02x was not defined") |
+#endif |
JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported") |
JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined") |
JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image") |
@@ -170,6 +183,9 @@ |
JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u") |
JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u") |
JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d") |
+#if JPEG_LIB_VERSION >= 70 |
+JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code") |
+#endif |
JMESSAGE(JWRN_BOGUS_PROGRESSION, |
"Inconsistent progression sequence for component %d coefficient %d") |
JMESSAGE(JWRN_EXTRANEOUS_DATA, |
@@ -182,6 +198,13 @@ |
"Corrupt JPEG data: found marker 0x%02x instead of RST%d") |
JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG") |
JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines") |
+#if JPEG_LIB_VERSION < 70 |
+JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request") |
+#if defined(C_ARITH_CODING_SUPPORTED) || defined(D_ARITH_CODING_SUPPORTED) |
+JMESSAGE(JERR_NO_ARITH_TABLE, "Arithmetic table 0x%02x was not defined") |
+JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code") |
+#endif |
+#endif |
#ifdef JMAKE_ENUM_LIST |