fixed crash on invalid data (patch 1039453)

[wxWidgets.git] / src / jpeg / jdhuff.h

diff --git a/src/jpeg/jdhuff.h b/src/jpeg/jdhuff.h
index ae19b6cafd7e81f94499d92876a6cf88bcafda86..e95ea05f8b93c920716eec162c2ed98c7cc2c4e7 100644 (file)
--- a/src/jpeg/jdhuff.h
+++ b/src/jpeg/jdhuff.h
@@ -25,9 +25,9 @@
 
 typedef struct {
   /* Basic tables: (element [0] of each array is unused) */
 
 typedef struct {
   /* Basic tables: (element [0] of each array is unused) */

-  INT32 maxcode[18];           /* largest code of length k (-1 if none) */
+  JPEG_INT32 maxcode[18];              /* largest code of length k (-1 if none) */

   /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
   /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */

-  INT32 valoffset[17];         /* huffval[] offset for codes of length k */
+  JPEG_INT32 valoffset[17];            /* huffval[] offset for codes of length k */

   /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
    * the smallest code of length k; so given a code of length k, the
    * corresponding symbol is huffval[code + valoffset[k]]
   /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
    * the smallest code of length k; so given a code of length k, the
    * corresponding symbol is huffval[code + valoffset[k]]


@@ -69,7 +69,7 @@ EXTERN(void) jpeg_make_d_derived_tbl
  * necessary.
  */
 
  * necessary.
  */
 

-typedef INT32 bit_buf_type;    /* type of bit-extraction buffer */
+typedef JPEG_INT32 bit_buf_type;       /* type of bit-extraction buffer */

 #define BIT_BUF_SIZE  32       /* size of buffer in bits */
 
 /* If long is > 32 bits on your machine, and shifting/masking longs is
 #define BIT_BUF_SIZE  32       /* size of buffer in bits */
 
 /* If long is > 32 bits on your machine, and shifting/masking longs is