Fix compilation errors under OSX.

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

diff --git a/src/jpeg/jquant1.c b/src/jpeg/jquant1.c
index b2f96aa15d25dd722c55b955bf0e475eb3160c15..f6d221f5f9298f4c2c9411bae4275f9feb63cdfd 100644 (file)
--- a/src/jpeg/jquant1.c
+++ b/src/jpeg/jquant1.c
@@ -128,8 +128,8 @@ static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {
 typedef INT16 FSERROR;         /* 16 bits should be enough */
 typedef int LOCFSERROR;                /* use 'int' for calculation temps */
 #else
 typedef INT16 FSERROR;         /* 16 bits should be enough */
 typedef int LOCFSERROR;                /* use 'int' for calculation temps */
 #else

-typedef INT32 FSERROR;         /* may need more than 16 bits */
-typedef INT32 LOCFSERROR;      /* be sure calculation temps are big enough */
+typedef JPEG_INT32 FSERROR;            /* may need more than 16 bits */
+typedef JPEG_INT32 LOCFSERROR; /* be sure calculation temps are big enough */

 #endif
 
 typedef FSERROR FAR *FSERRPTR; /* pointer to error array (in FAR storage!) */
 #endif
 
 typedef FSERROR FAR *FSERRPTR; /* pointer to error array (in FAR storage!) */


@@ -151,7 +151,7 @@ typedef struct {
    * premultiplied as described above.  Since colormap indexes must fit into
    * JSAMPLEs, the entries of this array will too.
    */
    * premultiplied as described above.  Since colormap indexes must fit into
    * JSAMPLEs, the entries of this array will too.
    */

-  boolean is_padded;           /* is the colorindex padded for odither? */
+  wxjpeg_boolean is_padded;            /* is the colorindex padded for odither? */

 
   int Ncolors[MAX_Q_COMPS];    /* # of values alloced to each component */
 
 
   int Ncolors[MAX_Q_COMPS];    /* # of values alloced to each component */
 


@@ -161,7 +161,7 @@ typedef struct {
 
   /* Variables for Floyd-Steinberg dithering */
   FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
 
   /* Variables for Floyd-Steinberg dithering */
   FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */

-  boolean on_odd_row;          /* flag to remember which row we are on */
+  wxjpeg_boolean on_odd_row;           /* flag to remember which row we are on */

 } my_cquantizer;
 
 typedef my_cquantizer * my_cquantize_ptr;
 } my_cquantizer;
 
 typedef my_cquantizer * my_cquantize_ptr;


@@ -191,7 +191,7 @@ select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
   int nc = cinfo->out_color_components; /* number of color components */
   int max_colors = cinfo->desired_number_of_colors;
   int total_colors, iroot, i, j;
   int nc = cinfo->out_color_components; /* number of color components */
   int max_colors = cinfo->desired_number_of_colors;
   int total_colors, iroot, i, j;

-  boolean changed;
+  wxjpeg_boolean changed;

   long temp;
   static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
 
   long temp;
   static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
 


@@ -251,7 +251,7 @@ output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
    * (Forcing the upper and lower values to the limits ensures that
    * dithering can't produce a color outside the selected gamut.)
    */
    * (Forcing the upper and lower values to the limits ensures that
    * dithering can't produce a color outside the selected gamut.)
    */

-  return (int) (((INT32) j * MAXJSAMPLE + maxj/2) / maxj);
+  return (int) (((JPEG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);

 }
 
 
 }
 
 


@@ -261,7 +261,7 @@ largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
 /* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
 {
   /* Breakpoints are halfway between values returned by output_value */
 /* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
 {
   /* Breakpoints are halfway between values returned by output_value */

-  return (int) (((INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
+  return (int) (((JPEG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));

 }
 
 
 }
 
 


@@ -397,7 +397,7 @@ make_odither_array (j_decompress_ptr cinfo, int ncolors)
 {
   ODITHER_MATRIX_PTR odither;
   int j,k;
 {
   ODITHER_MATRIX_PTR odither;
   int j,k;

-  INT32 num,den;
+  JPEG_INT32 num,den;

 
   odither = (ODITHER_MATRIX_PTR)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
 
   odither = (ODITHER_MATRIX_PTR)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,


@@ -407,10 +407,10 @@ make_odither_array (j_decompress_ptr cinfo, int ncolors)
    * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
    * On 16-bit-int machine, be careful to avoid overflow.
    */
    * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
    * On 16-bit-int machine, be careful to avoid overflow.
    */

-  den = 2 * ODITHER_CELLS * ((INT32) (ncolors - 1));
+  den = 2 * ODITHER_CELLS * ((JPEG_INT32) (ncolors - 1));

   for (j = 0; j < ODITHER_SIZE; j++) {
     for (k = 0; k < ODITHER_SIZE; k++) {
   for (j = 0; j < ODITHER_SIZE; j++) {
     for (k = 0; k < ODITHER_SIZE; k++) {

-      num = ((INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))
+      num = ((JPEG_INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))

            * MAXJSAMPLE;
       /* Ensure round towards zero despite C's lack of consistency
        * about rounding negative values in integer division...
            * MAXJSAMPLE;
       /* Ensure round towards zero despite C's lack of consistency
        * about rounding negative values in integer division...


@@ -738,7 +738,7 @@ alloc_fs_workspace (j_decompress_ptr cinfo)
  */
 
 METHODDEF(void)
  */
 
 METHODDEF(void)

-start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
+start_pass_1_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)

 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   size_t arraysize;
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   size_t arraysize;