Applied another Marco patch (5)

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

diff --git a/src/jpeg/jpegint.h b/src/jpeg/jpegint.h
index 95b00d405caeca1dc971b37a94bbadc566f3074b..14a51d14d835ac8fe7ddbffa0deafa2b417aa48d 100644 (file)
--- a/src/jpeg/jpegint.h
+++ b/src/jpeg/jpegint.h
@@ -142,6 +142,11 @@ struct jpeg_decomp_master {
   boolean is_dummy_pass;       /* True during 1st pass for 2-pass quant */
 };
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_input_pass   start_input_pass2 /* already in jcmaint.c */
+#endif
+
 /* Input control module */
 struct jpeg_input_controller {
   JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
@@ -154,6 +159,12 @@ struct jpeg_input_controller {
   boolean eoi_reached;         /* True when EOI has been consumed */
 };
 
+#if defined(__VISAGECPP__)
+#  ifdef start_input_pass2
+#   undef start_input_pass2
+#  endif
+#endif
+
 /* Main buffer control (downsampled-data buffer) */
 struct jpeg_d_main_controller {
   JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
@@ -164,7 +175,15 @@ struct jpeg_d_main_controller {
 
 /* Coefficient buffer control */
 struct jpeg_d_coef_controller {
+#if defined(__VISAGECPP__)
+  /* the start input pass in jdcoeft must have a different name than the
+  // one in jdtrans under VisualAge or else we get a dup symbol error
+  */
+  JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
+#else
   JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+#endif
+
   JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
   JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
   JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
@@ -280,10 +299,10 @@ struct jpeg_color_quantizer {
  */
 
 #ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS    INT32 shift_temp;
+#define SHIFT_TEMPS    JPEG_INT32 shift_temp;
 #define RIGHT_SHIFT(x,shft)  \
        ((shift_temp = (x)) < 0 ? \
-        (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+        (shift_temp >> (shft)) | ((~((JPEG_INT32) 0)) << (32-(shft))) : \
         (shift_temp >> (shft)))
 #else
 #define SHIFT_TEMPS