Fixed some warnings

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

diff --git a/src/jpeg/jdhuff.h b/src/jpeg/jdhuff.h
index ae19b6cafd7e81f94499d92876a6cf88bcafda86..9e9e87daeccf201374417929a614f77cb012669e 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]]


@@ -47,7 +47,7 @@ typedef struct {
 
 /* Expand a Huffman table definition into the derived format */
 EXTERN(void) jpeg_make_d_derived_tbl
 
 /* Expand a Huffman table definition into the derived format */
 EXTERN(void) jpeg_make_d_derived_tbl

-       JPP((j_decompress_ptr cinfo, boolean isDC, int tblno,
+       JPP((j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,

             d_derived_tbl ** pdtbl));
 
 
             d_derived_tbl ** pdtbl));
 
 


@@ -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


@@ -151,7 +151,7 @@ typedef struct {            /* Bitreading working state within an MCU */
        (bits_left -= (nbits))
 
 /* Load up the bit buffer to a depth of at least nbits */
        (bits_left -= (nbits))
 
 /* Load up the bit buffer to a depth of at least nbits */

-EXTERN(boolean) jpeg_fill_bit_buffer
+EXTERN(wxjpeg_boolean) jpeg_fill_bit_buffer

        JPP((bitread_working_state * state, register bit_buf_type get_buffer,
             register int bits_left, int nbits));
 
        JPP((bitread_working_state * state, register bit_buf_type get_buffer,
             register int bits_left, int nbits));