| Index: third_party/libjpeg_turbo/jmorecfg.h
|
| ===================================================================
|
| --- third_party/libjpeg_turbo/jmorecfg.h (revision 95020)
|
| +++ third_party/libjpeg_turbo/jmorecfg.h (working copy)
|
| @@ -159,10 +159,8 @@
|
| /* INT32 must hold at least signed 32-bit values. */
|
|
|
| #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
|
| -#ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
|
| typedef long INT32;
|
| #endif
|
| -#endif
|
|
|
| /* Datatype used for image dimensions. The JPEG standard only supports
|
| * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|
| @@ -212,13 +210,11 @@
|
| * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
|
| */
|
|
|
| -#ifndef FAR
|
| #ifdef NEED_FAR_POINTERS
|
| #define FAR far
|
| #else
|
| #define FAR
|
| #endif
|
| -#endif
|
|
|
|
|
| /*
|
| @@ -261,8 +257,6 @@
|
| * (You may HAVE to do that if your compiler doesn't like null source files.)
|
| */
|
|
|
| -/* Arithmetic coding is unsupported for legal reasons. Complaints to IBM. */
|
| -
|
| /* Capability options common to encoder and decoder: */
|
|
|
| #define DCT_ISLOW_SUPPORTED /* slow but accurate integer algorithm */
|
| @@ -271,7 +265,6 @@
|
|
|
| /* Encoder capability options: */
|
|
|
| -#undef C_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */
|
| #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
|
| #define C_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/
|
| #define ENTROPY_OPT_SUPPORTED /* Optimization of entropy coding parms? */
|
| @@ -287,7 +280,6 @@
|
|
|
| /* Decoder capability options: */
|
|
|
| -#undef D_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */
|
| #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
|
| #define D_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/
|
| #define SAVE_MARKERS_SUPPORTED /* jpeg_save_markers() needed? */
|
|
|