test that the candidate parent window isn't being deleted (this would result in a...

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

diff --git a/src/jpeg/jdinput.c b/src/jpeg/jdinput.c
index 324d0ffe0cd18bb588623bd804b21d94c3959bf1..c89b75de580030f1ce4766f28c49c439cd98e571 100644 (file)
--- a/src/jpeg/jdinput.c
+++ b/src/jpeg/jdinput.c
@@ -15,17 +15,12 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
 #include "jinclude.h"
 #include "jpeglib.h"
 

-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_input_pass   start_input_pass2 /* already in jcmaint.c */
-#endif
-

 /* Private state */
 
 typedef struct {
   struct jpeg_input_controller pub; /* public fields */
 
 /* Private state */
 
 typedef struct {
   struct jpeg_input_controller pub; /* public fields */
 

-  boolean inheaders;           /* TRUE until first SOS is reached */
+  wxjpeg_boolean inheaders;            /* TRUE until first SOS is reached */

 } my_input_controller;
 
 typedef my_input_controller * my_inputctl_ptr;
 } my_input_controller;
 
 typedef my_input_controller * my_inputctl_ptr;


@@ -260,7 +255,11 @@ start_input_pass (j_decompress_ptr cinfo)
   per_scan_setup(cinfo);
   latch_quant_tables(cinfo);
   (*cinfo->entropy->start_pass) (cinfo);
   per_scan_setup(cinfo);
   latch_quant_tables(cinfo);
   (*cinfo->entropy->start_pass) (cinfo);

+#if defined(__VISAGECPP__)
+  (*cinfo->coef->start_input_pass2) (cinfo);
+#else

   (*cinfo->coef->start_input_pass) (cinfo);
   (*cinfo->coef->start_input_pass) (cinfo);

+#endif

   cinfo->inputctl->consume_input = cinfo->coef->consume_data;
 }
 
   cinfo->inputctl->consume_input = cinfo->coef->consume_data;
 }
 


@@ -384,8 +383,3 @@ jinit_input_controller (j_decompress_ptr cinfo)
   inputctl->inheaders = TRUE;
 }
 
   inputctl->inheaders = TRUE;
 }
 

-#if defined(__VISAGECPP__)
-#  ifdef start_input_pass2
-#   undef start_input_pass2
-#  endif
-#endif