Clear attribute cache in Redimension to fix Bug 508407.

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

diff --git a/src/jpeg/jdhuff.c b/src/jpeg/jdhuff.c
index b5ba39f736a7ae4f059d4b0594f4cc8ff854e1f4..03e4fea4171138a3052e75b280b8cfe13457258c 100644 (file)
--- a/src/jpeg/jdhuff.c
+++ b/src/jpeg/jdhuff.c
@@ -204,7 +204,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
     /* code is now 1 more than the last code used for codelength si; but
      * it must still fit in si bits, since no code is allowed to be all ones.
      */
     /* code is now 1 more than the last code used for codelength si; but
      * it must still fit in si bits, since no code is allowed to be all ones.
      */

-    if (((INT32) code) >= (((INT32) 1) << si))
+    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))

       ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
     code <<= 1;
     si++;
       ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
     code <<= 1;
     si++;


@@ -218,7 +218,7 @@ jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
       /* valoffset[l] = huffval[] index of 1st symbol of code length l,
        * minus the minimum code of length l
        */
       /* valoffset[l] = huffval[] index of 1st symbol of code length l,
        * minus the minimum code of length l
        */

-      dtbl->valoffset[l] = (INT32) p - (INT32) huffcode[p];
+      dtbl->valoffset[l] = (JPEG_INT32) p - (JPEG_INT32) huffcode[p];

       p += htbl->bits[l];
       dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
     } else {
       p += htbl->bits[l];
       dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
     } else {


@@ -400,7 +400,7 @@ jpeg_huff_decode (bitread_working_state * state,
                  d_derived_tbl * htbl, int min_bits)
 {
   register int l = min_bits;
                  d_derived_tbl * htbl, int min_bits)
 {
   register int l = min_bits;

-  register INT32 code;
+  register JPEG_INT32 code;

 
   /* HUFF_DECODE has determined that the code is at least min_bits */
   /* bits long, so fetch that many bits in one swoop. */
 
   /* HUFF_DECODE has determined that the code is at least min_bits */
   /* bits long, so fetch that many bits in one swoop. */