mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 13:21:05 +00:00
update jpeg-turbo to 2.1.0
This commit is contained in:
parent
0134fe3950
commit
18fde2444c
5 changed files with 16 additions and 43 deletions
9
deps/jpeg-turbo/include/jconfig.h
vendored
9
deps/jpeg-turbo/include/jconfig.h
vendored
|
@ -4,10 +4,10 @@
|
||||||
#define JPEG_LIB_VERSION 62
|
#define JPEG_LIB_VERSION 62
|
||||||
|
|
||||||
/* libjpeg-turbo version */
|
/* libjpeg-turbo version */
|
||||||
#define LIBJPEG_TURBO_VERSION 2.0.6
|
#define LIBJPEG_TURBO_VERSION 2.1.0
|
||||||
|
|
||||||
/* libjpeg-turbo version in integer form */
|
/* libjpeg-turbo version in integer form */
|
||||||
#define LIBJPEG_TURBO_VERSION_NUMBER 2000006
|
#define LIBJPEG_TURBO_VERSION_NUMBER 2001000
|
||||||
|
|
||||||
/* Support arithmetic encoding */
|
/* Support arithmetic encoding */
|
||||||
#define C_ARITH_CODING_SUPPORTED 1
|
#define C_ARITH_CODING_SUPPORTED 1
|
||||||
|
@ -61,11 +61,6 @@
|
||||||
unsigned. */
|
unsigned. */
|
||||||
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
|
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
|
||||||
|
|
||||||
/* Define to 1 if type `char' is unsigned and you are not using gcc. */
|
|
||||||
#ifndef __CHAR_UNSIGNED__
|
|
||||||
/* #undef __CHAR_UNSIGNED__ */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Define to empty if `const' does not conform to ANSI C. */
|
/* Define to empty if `const' does not conform to ANSI C. */
|
||||||
/* #undef const */
|
/* #undef const */
|
||||||
|
|
||||||
|
|
13
deps/jpeg-turbo/include/jerror.h
vendored
13
deps/jpeg-turbo/include/jerror.h
vendored
|
@ -207,6 +207,10 @@ JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code")
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
JMESSAGE(JWRN_BOGUS_ICC, "Corrupt JPEG data: bad ICC marker")
|
JMESSAGE(JWRN_BOGUS_ICC, "Corrupt JPEG data: bad ICC marker")
|
||||||
|
#if JPEG_LIB_VERSION < 70
|
||||||
|
JMESSAGE(JERR_BAD_DROP_SAMPLING,
|
||||||
|
"Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c")
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef JMAKE_ENUM_LIST
|
#ifdef JMAKE_ENUM_LIST
|
||||||
|
|
||||||
|
@ -252,6 +256,15 @@ JMESSAGE(JWRN_BOGUS_ICC, "Corrupt JPEG data: bad ICC marker")
|
||||||
(cinfo)->err->msg_parm.i[2] = (p3), \
|
(cinfo)->err->msg_parm.i[2] = (p3), \
|
||||||
(cinfo)->err->msg_parm.i[3] = (p4), \
|
(cinfo)->err->msg_parm.i[3] = (p4), \
|
||||||
(*(cinfo)->err->error_exit) ((j_common_ptr)(cinfo)))
|
(*(cinfo)->err->error_exit) ((j_common_ptr)(cinfo)))
|
||||||
|
#define ERREXIT6(cinfo, code, p1, p2, p3, p4, p5, p6) \
|
||||||
|
((cinfo)->err->msg_code = (code), \
|
||||||
|
(cinfo)->err->msg_parm.i[0] = (p1), \
|
||||||
|
(cinfo)->err->msg_parm.i[1] = (p2), \
|
||||||
|
(cinfo)->err->msg_parm.i[2] = (p3), \
|
||||||
|
(cinfo)->err->msg_parm.i[3] = (p4), \
|
||||||
|
(cinfo)->err->msg_parm.i[4] = (p5), \
|
||||||
|
(cinfo)->err->msg_parm.i[5] = (p6), \
|
||||||
|
(*(cinfo)->err->error_exit) ((j_common_ptr)(cinfo)))
|
||||||
#define ERREXITS(cinfo, code, str) \
|
#define ERREXITS(cinfo, code, str) \
|
||||||
((cinfo)->err->msg_code = (code), \
|
((cinfo)->err->msg_code = (code), \
|
||||||
strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
|
strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
|
||||||
|
|
35
deps/jpeg-turbo/include/jmorecfg.h
vendored
35
deps/jpeg-turbo/include/jmorecfg.h
vendored
|
@ -43,25 +43,11 @@
|
||||||
|
|
||||||
#if BITS_IN_JSAMPLE == 8
|
#if BITS_IN_JSAMPLE == 8
|
||||||
/* JSAMPLE should be the smallest type that will hold the values 0..255.
|
/* JSAMPLE should be the smallest type that will hold the values 0..255.
|
||||||
* You can use a signed char by having GETJSAMPLE mask it with 0xFF.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_UNSIGNED_CHAR
|
|
||||||
|
|
||||||
typedef unsigned char JSAMPLE;
|
typedef unsigned char JSAMPLE;
|
||||||
#define GETJSAMPLE(value) ((int)(value))
|
#define GETJSAMPLE(value) ((int)(value))
|
||||||
|
|
||||||
#else /* not HAVE_UNSIGNED_CHAR */
|
|
||||||
|
|
||||||
typedef char JSAMPLE;
|
|
||||||
#ifdef __CHAR_UNSIGNED__
|
|
||||||
#define GETJSAMPLE(value) ((int)(value))
|
|
||||||
#else
|
|
||||||
#define GETJSAMPLE(value) ((int)(value) & 0xFF)
|
|
||||||
#endif /* __CHAR_UNSIGNED__ */
|
|
||||||
|
|
||||||
#endif /* HAVE_UNSIGNED_CHAR */
|
|
||||||
|
|
||||||
#define MAXJSAMPLE 255
|
#define MAXJSAMPLE 255
|
||||||
#define CENTERJSAMPLE 128
|
#define CENTERJSAMPLE 128
|
||||||
|
|
||||||
|
@ -97,22 +83,9 @@ typedef short JCOEF;
|
||||||
* managers, this is also the data type passed to fread/fwrite.
|
* managers, this is also the data type passed to fread/fwrite.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_UNSIGNED_CHAR
|
|
||||||
|
|
||||||
typedef unsigned char JOCTET;
|
typedef unsigned char JOCTET;
|
||||||
#define GETJOCTET(value) (value)
|
#define GETJOCTET(value) (value)
|
||||||
|
|
||||||
#else /* not HAVE_UNSIGNED_CHAR */
|
|
||||||
|
|
||||||
typedef char JOCTET;
|
|
||||||
#ifdef __CHAR_UNSIGNED__
|
|
||||||
#define GETJOCTET(value) (value)
|
|
||||||
#else
|
|
||||||
#define GETJOCTET(value) ((value) & 0xFF)
|
|
||||||
#endif /* __CHAR_UNSIGNED__ */
|
|
||||||
|
|
||||||
#endif /* HAVE_UNSIGNED_CHAR */
|
|
||||||
|
|
||||||
|
|
||||||
/* These typedefs are used for various table entries and so forth.
|
/* These typedefs are used for various table entries and so forth.
|
||||||
* They must be at least as wide as specified; but making them too big
|
* They must be at least as wide as specified; but making them too big
|
||||||
|
@ -123,15 +96,7 @@ typedef char JOCTET;
|
||||||
|
|
||||||
/* UINT8 must hold at least the values 0..255. */
|
/* UINT8 must hold at least the values 0..255. */
|
||||||
|
|
||||||
#ifdef HAVE_UNSIGNED_CHAR
|
|
||||||
typedef unsigned char UINT8;
|
typedef unsigned char UINT8;
|
||||||
#else /* not HAVE_UNSIGNED_CHAR */
|
|
||||||
#ifdef __CHAR_UNSIGNED__
|
|
||||||
typedef char UINT8;
|
|
||||||
#else /* not __CHAR_UNSIGNED__ */
|
|
||||||
typedef short UINT8;
|
|
||||||
#endif /* __CHAR_UNSIGNED__ */
|
|
||||||
#endif /* HAVE_UNSIGNED_CHAR */
|
|
||||||
|
|
||||||
/* UINT16 must hold at least the values 0..65535. */
|
/* UINT16 must hold at least the values 0..65535. */
|
||||||
|
|
||||||
|
|
BIN
deps/jpeg-turbo/lib/libjpeg.a
vendored
BIN
deps/jpeg-turbo/lib/libjpeg.a
vendored
Binary file not shown.
2
deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc
vendored
2
deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc
vendored
|
@ -5,6 +5,6 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: libjpeg
|
Name: libjpeg
|
||||||
Description: A SIMD-accelerated JPEG codec that provides the libjpeg API
|
Description: A SIMD-accelerated JPEG codec that provides the libjpeg API
|
||||||
Version: 2.0.6
|
Version: 2.1.0
|
||||||
Libs: -L${libdir} -ljpeg
|
Libs: -L${libdir} -ljpeg
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in a new issue