now we don't only show label mnemonics but they also work

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

diff --git a/src/jpeg/jchuff.c b/src/jpeg/jchuff.c
index f235250548671f2d52cabd12ce366a07db4cbf34..c65310590a4722f53aa2bf99050a27397beb47b6 100644 (file)
--- a/src/jpeg/jchuff.c
+++ b/src/jpeg/jchuff.c
@@ -27,7 +27,7 @@
  */
 
 typedef struct {
  */
 
 typedef struct {

-  INT32 put_buffer;            /* current bit-accumulation buffer */
+  JPEG_INT32 put_buffer;               /* current bit-accumulation buffer */

   int put_bits;                        /* # of bits now in it */
   int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
 } savable_state;
   int put_bits;                        /* # of bits now in it */
   int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
 } savable_state;


@@ -232,7 +232,7 @@ jpeg_make_c_derived_tbl (j_compress_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++;


@@ -303,14 +303,14 @@ emit_bits (working_state * state, unsigned int code, int size)
 /* Emit some bits; return TRUE if successful, FALSE if must suspend */
 {
   /* This routine is heavily used, so it's worth coding tightly. */
 /* Emit some bits; return TRUE if successful, FALSE if must suspend */
 {
   /* This routine is heavily used, so it's worth coding tightly. */

-  register INT32 put_buffer = (INT32) code;
+  register JPEG_INT32 put_buffer = (JPEG_INT32) code;

   register int put_bits = state->cur.put_bits;
 
   /* if size is 0, caller used an invalid Huffman table entry */
   if (size == 0)
     ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
 
   register int put_bits = state->cur.put_bits;
 
   /* if size is 0, caller used an invalid Huffman table entry */
   if (size == 0)
     ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
 

-  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+  put_buffer &= (((JPEG_INT32) 1)<<size) - 1; /* mask off any extra bits in code */

   
   put_bits += size;            /* new number of bits in buffer */
   
   
   put_bits += size;            /* new number of bits in buffer */