mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 07:05:24 +00:00
dcced52d74
--HG-- extra : commitid : E8TzkSU0TOC extra : rebase_source : df175815820cba7829062fd69f93f9a8aeceb473
60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
diff --git jmorecfg.h jmorecfg.h
|
|
index be89189..3b0d05a 100644
|
|
--- jmorecfg.h
|
|
+++ jmorecfg.h
|
|
@@ -13,6 +13,7 @@
|
|
* optimizations. Most users will not need to touch this file.
|
|
*/
|
|
|
|
+#include <stdint.h>
|
|
|
|
/*
|
|
* Maximum number of components (color channels) allowed in JPEG image.
|
|
@@ -122,42 +123,19 @@ typedef char JOCTET;
|
|
|
|
/* 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 */
|
|
+typedef uint8_t UINT8;
|
|
|
|
/* 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 */
|
|
+typedef uint16_t UINT16;
|
|
|
|
/* INT16 must hold at least the values -32768..32767. */
|
|
|
|
-#ifndef XMD_H /* X11/xmd.h correctly defines INT16 */
|
|
-typedef short INT16;
|
|
-#endif
|
|
+typedef int16_t INT16;
|
|
|
|
/* INT32 must hold at least signed 32-bit values. */
|
|
|
|
-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
|
|
-#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 */
|
|
-#define __INT32_IS_ACTUALLY_LONG
|
|
-typedef long INT32;
|
|
-#endif
|
|
-#endif
|
|
-#endif
|
|
-#endif
|
|
+typedef int32_t INT32;
|
|
|
|
/* Datatype used for image dimensions. The JPEG standard only supports
|
|
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|