fixing bug 1841377

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

diff --git a/src/jpeg/jdcoefct.c b/src/jpeg/jdcoefct.c
index 4b89b62d24099604cf27a8809ec7bf0c7424212f..e5c3636e46dee1c04a9b556d50cfbc41747a10ac 100644 (file)
--- a/src/jpeg/jdcoefct.c
+++ b/src/jpeg/jdcoefct.c
@@ -69,7 +69,7 @@ METHODDEF(int) decompress_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED

-LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+LOCAL(wxjpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));

 METHODDEF(int) decompress_smooth_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 METHODDEF(int) decompress_smooth_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif


@@ -104,13 +104,16 @@ start_iMCU_row (j_decompress_ptr cinfo)
  */
 
 METHODDEF(void)
  */
 
 METHODDEF(void)

+#if defined(__VISAGECPP__)
+start_input_pass2 (j_decompress_ptr cinfo)
+#else

 start_input_pass (j_decompress_ptr cinfo)
 start_input_pass (j_decompress_ptr cinfo)

+#endif

 {
   cinfo->input_iMCU_row = 0;
   start_iMCU_row(cinfo);
 }
 
 {
   cinfo->input_iMCU_row = 0;
   start_iMCU_row(cinfo);
 }
 

-

 /*
  * Initialize for an output processing pass.
  */
 /*
  * Initialize for an output processing pass.
  */


@@ -401,11 +404,11 @@ decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
  * more accurately than they really are.
  */
 
  * more accurately than they really are.
  */
 

-LOCAL(boolean)
+LOCAL(wxjpeg_boolean)

 smoothing_ok (j_decompress_ptr cinfo)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
 smoothing_ok (j_decompress_ptr cinfo)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  boolean smoothing_useful = FALSE;
+  wxjpeg_boolean smoothing_useful = FALSE;

   int ci, coefi;
   jpeg_component_info *compptr;
   JQUANT_TBL * qtable;
   int ci, coefi;
   jpeg_component_info *compptr;
   JQUANT_TBL * qtable;


@@ -470,7 +473,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
   JDIMENSION output_col;
   jpeg_component_info *compptr;
   inverse_DCT_method_ptr inverse_DCT;
   JDIMENSION output_col;
   jpeg_component_info *compptr;
   inverse_DCT_method_ptr inverse_DCT;

-  boolean first_row, last_row;
+  wxjpeg_boolean first_row, last_row;

   JBLOCK workspace;
   int *coef_bits;
   JQUANT_TBL *quanttbl;
   JBLOCK workspace;
   int *coef_bits;
   JQUANT_TBL *quanttbl;


@@ -673,7 +676,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
  */
 
 GLOBAL(void)
  */
 
 GLOBAL(void)

-jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)

 {
   my_coef_ptr coef;
 
 {
   my_coef_ptr coef;
 


@@ -681,7 +684,12 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                SIZEOF(my_coef_controller));
   cinfo->coef = (struct jpeg_d_coef_controller *) coef;
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                SIZEOF(my_coef_controller));
   cinfo->coef = (struct jpeg_d_coef_controller *) coef;

+#if defined(__VISAGECPP__)
+  coef->pub.start_input_pass2 = start_input_pass2;
+#else

   coef->pub.start_input_pass = start_input_pass;
   coef->pub.start_input_pass = start_input_pass;

+#endif
+

   coef->pub.start_output_pass = start_output_pass;
 #ifdef BLOCK_SMOOTHING_SUPPORTED
   coef->coef_bits_latch = NULL;
   coef->pub.start_output_pass = start_output_pass;
 #ifdef BLOCK_SMOOTHING_SUPPORTED
   coef->coef_bits_latch = NULL;


@@ -734,3 +742,4 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
     coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
   }
 }
     coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
   }
 }

+