Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/jpeg/jdsample.c b/src/jpeg/jdsample.c
index 80ffefb2a1ccf5ddc1530b921df0eef6e3e45c18..8c8fc1713c5eee347cc69db61533431c54040a6a 100644 (file)
--- a/src/jpeg/jdsample.c
+++ b/src/jpeg/jdsample.c
@@ -350,7 +350,7 @@ h2v2_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
 #if BITS_IN_JSAMPLE == 8
   register int thiscolsum, lastcolsum, nextcolsum;
 #else
 #if BITS_IN_JSAMPLE == 8
   register int thiscolsum, lastcolsum, nextcolsum;
 #else

-  register INT32 thiscolsum, lastcolsum, nextcolsum;
+  register JPEG_INT32 thiscolsum, lastcolsum, nextcolsum;

 #endif
   register JDIMENSION colctr;
   int inrow, outrow, v;
 #endif
   register JDIMENSION colctr;
   int inrow, outrow, v;


@@ -401,7 +401,7 @@ jinit_upsampler (j_decompress_ptr cinfo)
   my_upsample_ptr upsample;
   int ci;
   jpeg_component_info * compptr;
   my_upsample_ptr upsample;
   int ci;
   jpeg_component_info * compptr;

-  boolean need_buffer, do_fancy;
+  wxjpeg_boolean need_buffer, do_fancy;

   int h_in_group, v_in_group, h_out_group, v_out_group;
 
   upsample = (my_upsample_ptr)
   int h_in_group, v_in_group, h_out_group, v_out_group;
 
   upsample = (my_upsample_ptr)