2015-10-05 13:31:36 +00:00
|
|
|
diff --git jmorecfg.h jmorecfg.h
|
|
|
|
|
--- jmorecfg.h
|
|
|
|
|
+++ jmorecfg.h
|
2018-10-09 15:23:57 +00:00
|
|
|
@@ -13,8 +13,9 @@
|
2016-06-26 19:41:09 +00:00
|
|
|
* JPEG software for special applications or support machine-dependent
|
2012-02-11 08:34:00 +00:00
|
|
|
* optimizations. Most users will not need to touch this file.
|
|
|
|
|
*/
|
|
|
|
|
|
2013-07-30 14:25:31 +00:00
|
|
|
+#include <stdint.h>
|
2012-02-11 08:34:00 +00:00
|
|
|
|
|
|
|
|
/*
|
2015-01-21 03:19:57 +00:00
|
|
|
* Maximum number of components (color channels) allowed in JPEG image.
|
2018-10-09 15:23:57 +00:00
|
|
|
* To meet the letter of Rec. ITU-T T.81 | ISO/IEC 10918-1, set this to 255.
|
|
|
|
|
@@ -122,31 +123,17 @@ typedef char JOCTET;
|
2016-06-26 19:41:09 +00:00
|
|
|
*/
|
2012-02-11 08:34:00 +00:00
|
|
|
|
|
|
|
|
/* UINT8 must hold at least the values 0..255. */
|
|
|
|
|
|
|
|
|
|
-#ifdef HAVE_UNSIGNED_CHAR
|
|
|
|
|
-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 */
|
2012-08-22 15:59:54 +00:00
|
|
|
+typedef uint8_t UINT8;
|
2012-02-11 08:34:00 +00:00
|
|
|
|
|
|
|
|
/* UINT16 must hold at least the values 0..65535. */
|
|
|
|
|
|
|
|
|
|
-#ifdef HAVE_UNSIGNED_SHORT
|
|
|
|
|
-typedef unsigned short UINT16;
|
|
|
|
|
-#else /* not HAVE_UNSIGNED_SHORT */
|
|
|
|
|
-typedef unsigned int UINT16;
|
|
|
|
|
-#endif /* HAVE_UNSIGNED_SHORT */
|
2012-08-22 15:59:54 +00:00
|
|
|
+typedef uint16_t UINT16;
|
2012-02-11 08:34:00 +00:00
|
|
|
|
|
|
|
|
/* INT16 must hold at least the values -32768..32767. */
|
|
|
|
|
|
2015-01-21 03:19:57 +00:00
|
|
|
-#ifndef XMD_H /* X11/xmd.h correctly defines INT16 */
|
2012-02-11 08:34:00 +00:00
|
|
|
-typedef short INT16;
|
|
|
|
|
-#endif
|
2012-08-22 15:59:54 +00:00
|
|
|
+typedef int16_t INT16;
|
2012-02-11 08:34:00 +00:00
|
|
|
|
2016-06-26 19:41:09 +00:00
|
|
|
/* INT32 must hold at least signed 32-bit values.
|
|
|
|
|
*
|
|
|
|
|
* NOTE: The INT32 typedef dates back to libjpeg v5 (1994.) Integers were
|
2018-10-09 15:23:57 +00:00
|
|
|
@@ -171,17 +158,9 @@ typedef short INT16;
|
2016-06-26 19:41:09 +00:00
|
|
|
* for internal use, which ensures that internal behavior will always be the
|
|
|
|
|
* same regardless of any external headers that may be included.
|
|
|
|
|
*/
|
2012-02-11 08:34:00 +00:00
|
|
|
|
2015-01-21 03:19:57 +00:00
|
|
|
-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
|
2018-10-09 15:23:57 +00:00
|
|
|
-#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
|
|
|
|
|
-#ifndef _BASETSD_H /* MinGW is slightly different */
|
|
|
|
|
-#ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
|
2012-02-11 08:34:00 +00:00
|
|
|
-typedef long INT32;
|
|
|
|
|
-#endif
|
2015-10-05 13:31:36 +00:00
|
|
|
-#endif
|
|
|
|
|
-#endif
|
|
|
|
|
-#endif
|
2012-08-22 15:59:54 +00:00
|
|
|
+typedef int32_t INT32;
|
2012-02-11 08:34:00 +00:00
|
|
|
|
|
|
|
|
/* Datatype used for image dimensions. The JPEG standard only supports
|
|
|
|
|
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|
2016-06-26 19:41:09 +00:00
|
|
|
* "unsigned int" is sufficient on all machines. However, if you need to
|
