Don't needlessly indirect through NSNotificationCenter.

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

diff --git a/src/jpeg/jdmaster.c b/src/jpeg/jdmaster.c
index 2802c5b7b29757e27b561ccccedba169deb9b42c..d68747631a164c61ad062cc4df7652bb931e6763 100644 (file)
--- a/src/jpeg/jdmaster.c
+++ b/src/jpeg/jdmaster.c
@@ -15,7 +15,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
 #include "jinclude.h"
 #include "jpeglib.h"
 

-

 /* Private state */
 
 typedef struct {
 /* Private state */
 
 typedef struct {


@@ -23,7 +22,7 @@ typedef struct {
 
   int pass_number;             /* # of passes completed */
 
 
   int pass_number;             /* # of passes completed */
 

-  boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+  wxjpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */

 
   /* Saved references to initialized quantizer modules,
    * in case we need to switch modes.
 
   /* Saved references to initialized quantizer modules,
    * in case we need to switch modes.


@@ -40,7 +39,7 @@ typedef my_decomp_master * my_master_ptr;
  * CRUCIAL: this must match the actual capabilities of jdmerge.c!
  */
 
  * CRUCIAL: this must match the actual capabilities of jdmerge.c!
  */
 

-LOCAL(boolean)
+LOCAL(wxjpeg_boolean)

 use_merged_upsample (j_decompress_ptr cinfo)
 {
 #ifdef UPSAMPLE_MERGING_SUPPORTED
 use_merged_upsample (j_decompress_ptr cinfo)
 {
 #ifdef UPSAMPLE_MERGING_SUPPORTED


@@ -217,7 +216,7 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
  * For most steps we can mathematically guarantee that the initial value
  * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
  * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial
  * For most steps we can mathematically guarantee that the initial value
  * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
  * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial

- * limiting step (just after the IDCT), a wildly out-of-range value is 
+ * limiting step (just after the IDCT), a wildly out-of-range value is

  * possible if the input data is corrupt.  To avoid any chance of indexing
  * off the end of memory and getting a bad-pointer trap, we perform the
  * post-IDCT limiting thus:
  * possible if the input data is corrupt.  To avoid any chance of indexing
  * off the end of memory and getting a bad-pointer trap, we perform the
  * post-IDCT limiting thus:


@@ -288,7 +287,7 @@ LOCAL(void)
 master_selection (j_decompress_ptr cinfo)
 {
   my_master_ptr master = (my_master_ptr) cinfo->master;
 master_selection (j_decompress_ptr cinfo)
 {
   my_master_ptr master = (my_master_ptr) cinfo->master;

-  boolean use_c_buffer;
+  wxjpeg_boolean use_c_buffer;

   long samplesperrow;
   JDIMENSION jd_samplesperrow;
 
   long samplesperrow;
   JDIMENSION jd_samplesperrow;
 


@@ -555,3 +554,4 @@ jinit_master_decompress (j_decompress_ptr cinfo)
 
   master_selection(cinfo);
 }
 
   master_selection(cinfo);
 }

+