media/libjpeg/mozilla.diff

   1 diff --git jmorecfg.h jmorecfg.h
   2 --- jmorecfg.h
   3 +++ jmorecfg.h
   4 @@ -13,8 +13,9 @@
   5   * JPEG software for special applications or support machine-dependent
   6   * optimizations.  Most users will not need to touch this file.
   7   */
   8
   9 +#include <stdint.h>
  10
  11  /*
  12   * Maximum number of components (color channels) allowed in JPEG image.
  13   * To meet the letter of Rec. ITU-T T.81 | ISO/IEC 10918-1, set this to 255.
  14 @@ -122,31 +123,17 @@ typedef char JOCTET;
  15   */
  16
  17  /* UINT8 must hold at least the values 0..255. */
  18
  19 -#ifdef HAVE_UNSIGNED_CHAR
  20 -typedef unsigned char UINT8;
  21 -#else /* not HAVE_UNSIGNED_CHAR */
  22 -#ifdef __CHAR_UNSIGNED__
  23 -typedef char UINT8;
  24 -#else /* not __CHAR_UNSIGNED__ */
  25 -typedef short UINT8;
  26 -#endif /* __CHAR_UNSIGNED__ */
  27 -#endif /* HAVE_UNSIGNED_CHAR */
  28 +typedef uint8_t UINT8;
  29
  30  /* UINT16 must hold at least the values 0..65535. */
  31
  32 -#ifdef HAVE_UNSIGNED_SHORT
  33 -typedef unsigned short UINT16;
  34 -#else /* not HAVE_UNSIGNED_SHORT */
  35 -typedef unsigned int UINT16;
  36 -#endif /* HAVE_UNSIGNED_SHORT */
  37 +typedef uint16_t UINT16;
  38
  39  /* INT16 must hold at least the values -32768..32767. */
  40
  41 -#ifndef XMD_H                   /* X11/xmd.h correctly defines INT16 */
  42 -typedef short INT16;
  43 -#endif
  44 +typedef int16_t INT16;
  45
  46  /* INT32 must hold at least signed 32-bit values.
  47   *
  48   * NOTE: The INT32 typedef dates back to libjpeg v5 (1994.)  Integers were
  49 @@ -171,17 +158,9 @@ typedef short INT16;
  50   * for internal use, which ensures that internal behavior will always be the
  51   * same regardless of any external headers that may be included.
  52   */
  53
  54 -#ifndef XMD_H                   /* X11/xmd.h correctly defines INT32 */
  55 -#ifndef _BASETSD_H_             /* Microsoft defines it in basetsd.h */
  56 -#ifndef _BASETSD_H              /* MinGW is slightly different */
  57 -#ifndef QGLOBAL_H               /* Qt defines it in qglobal.h */
  58 -typedef long INT32;
  59 -#endif
  60 -#endif
  61 -#endif
  62 -#endif
  63 +typedef int32_t INT32;
  64
  65  /* Datatype used for image dimensions.  The JPEG standard only supports
  66   * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
  67   * "unsigned int" is sufficient on all machines.  However, if you need to