wxDataViewCtrl WIP.

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

diff --git a/src/jpeg/jcphuff.c b/src/jpeg/jcphuff.c
index 07f9178b01c885820889cf377c0e73d444f5dd1b..a98ea1d4580c467ecf74b4a4c2ea1d92774355bc 100644 (file)
--- a/src/jpeg/jcphuff.c
+++ b/src/jpeg/jcphuff.c
@@ -32,7 +32,7 @@ typedef struct {
    */
   JOCTET * next_output_byte;   /* => next byte to write in buffer */
   size_t free_in_buffer;       /* # of byte spaces remaining in buffer */
    */
   JOCTET * next_output_byte;   /* => next byte to write in buffer */
   size_t free_in_buffer;       /* # of byte spaces remaining in buffer */

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

   int put_bits;                        /* # of bits now in it */
   j_compress_ptr cinfo;                /* link to cinfo (needed for dump_buffer) */
 
   int put_bits;                        /* # of bits now in it */
   j_compress_ptr cinfo;                /* link to cinfo (needed for dump_buffer) */
 


@@ -229,7 +229,7 @@ emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
 /* Emit some bits, unless we are in gather mode */
 {
   /* This routine is heavily used, so it's worth coding tightly. */
 /* Emit some bits, unless we are in gather mode */
 {
   /* 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 = entropy->put_bits;
 
   /* if size is 0, caller used an invalid Huffman table entry */
   register int put_bits = entropy->put_bits;
 
   /* if size is 0, caller used an invalid Huffman table entry */


@@ -239,7 +239,7 @@ emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
   if (entropy->gather_statistics)
     return;                    /* do nothing if we're only getting stats */
 
   if (entropy->gather_statistics)
     return;                    /* do nothing if we're only getting stats */
 

-  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 */