Don't call StartingKey if the key was F2

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

diff --git a/src/jpeg/jpegint.h b/src/jpeg/jpegint.h
index 95b00d405caeca1dc971b37a94bbadc566f3074b..ee99a2e927df5a53cc57512dd1ced8b9742a422c 100644 (file)
--- a/src/jpeg/jpegint.h
+++ b/src/jpeg/jpegint.h
@@ -164,7 +164,15 @@ struct jpeg_d_main_controller {
 
 /* Coefficient buffer control */
 struct jpeg_d_coef_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));
   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,
   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 +288,10 @@ struct jpeg_color_quantizer {
  */
 
 #ifdef RIGHT_SHIFT_IS_UNSIGNED
  */
 
 #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 ? \
 #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
         (shift_temp >> (shft)))
 #else
 #define SHIFT_TEMPS