diff --git a/thirdparty/libjpeg-turbo/src/jmorecfg.h b/thirdparty/libjpeg-turbo/src/jmorecfg.h index 89c7842c87..c96edd2300 100644 --- a/thirdparty/libjpeg-turbo/src/jmorecfg.h +++ b/thirdparty/libjpeg-turbo/src/jmorecfg.h @@ -1,3 +1,5 @@ +// Modified to remove lossless jpeg support. + /* * jmorecfg.h * @@ -242,7 +244,7 @@ typedef int boolean; #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */ #define C_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/ -#define C_LOSSLESS_SUPPORTED /* Lossless JPEG? */ +//#define C_LOSSLESS_SUPPORTED /* Lossless JPEG? */ #define ENTROPY_OPT_SUPPORTED /* Optimization of entropy coding parms? */ /* Note: if you selected 12-bit data precision, it is dangerous to turn off * ENTROPY_OPT_SUPPORTED. The standard Huffman tables are only good for 8-bit @@ -259,7 +261,7 @@ typedef int boolean; #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */ #define D_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/ -#define D_LOSSLESS_SUPPORTED /* Lossless JPEG? */ +//#define D_LOSSLESS_SUPPORTED /* Lossless JPEG? */ #define SAVE_MARKERS_SUPPORTED /* jpeg_save_markers() needed? */ #define BLOCK_SMOOTHING_SUPPORTED /* Block smoothing? (Progressive only) */ #define IDCT_SCALING_SUPPORTED /* Output rescaling via IDCT? */ diff --git a/thirdparty/libjpeg-turbo/src/turbojpeg.c b/thirdparty/libjpeg-turbo/src/turbojpeg.c index 23dbe6bb75..969174f72e 100644 --- a/thirdparty/libjpeg-turbo/src/turbojpeg.c +++ b/thirdparty/libjpeg-turbo/src/turbojpeg.c @@ -1196,9 +1196,6 @@ bailout: #define BITS_IN_JSAMPLE 12 #include "turbojpeg-mp.c" #undef BITS_IN_JSAMPLE -#define BITS_IN_JSAMPLE 16 -#include "turbojpeg-mp.c" -#undef BITS_IN_JSAMPLE /* TurboJPEG 1.2+ */ DLLEXPORT int tjCompress2(tjhandle handle, const unsigned char *srcBuf,