Use same type in both results of A?B:C operator (Tinderbox build fix).

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

diff --git a/src/jpeg/jcsample.c b/src/jpeg/jcsample.c
index 212ec8757c4ca865eba34a80530d42e8d371dec7..b7bd0ea8e0870a39e718b18e5b26cc2cb258e691 100644 (file)
--- a/src/jpeg/jcsample.c
+++ b/src/jpeg/jcsample.c
@@ -144,7 +144,7 @@ int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
   JDIMENSION outcol, outcol_h; /* outcol_h == outcol*h_expand */
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   JSAMPROW inptr, outptr;
   JDIMENSION outcol, outcol_h; /* outcol_h == outcol*h_expand */
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   JSAMPROW inptr, outptr;

-  INT32 outvalue;
+  JPEG_INT32 outvalue;

 
   h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
   v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
 
   h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
   v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;


@@ -167,7 +167,7 @@ int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
       for (v = 0; v < v_expand; v++) {
        inptr = input_data[inrow+v] + outcol_h;
        for (h = 0; h < h_expand; h++) {
       for (v = 0; v < v_expand; v++) {
        inptr = input_data[inrow+v] + outcol_h;
        for (h = 0; h < h_expand; h++) {

-         outvalue += (INT32) GETJSAMPLE(*inptr++);
+         outvalue += (JPEG_INT32) GETJSAMPLE(*inptr++);

        }
       }
       *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
        }
       }
       *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);


@@ -296,7 +296,7 @@ h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
   JDIMENSION colctr;
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;
   JDIMENSION colctr;
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;

-  INT32 membersum, neighsum, memberscale, neighscale;
+  JPEG_INT32 membersum, neighsum, memberscale, neighscale;

 
   /* Expand input data enough to let all the output samples be generated
    * by the standard loop.  Special-casing padded output would be more
 
   /* Expand input data enough to let all the output samples be generated
    * by the standard loop.  Special-casing padded output would be more


@@ -396,7 +396,7 @@ fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,
   JDIMENSION colctr;
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   register JSAMPROW inptr, above_ptr, below_ptr, outptr;
   JDIMENSION colctr;
   JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
   register JSAMPROW inptr, above_ptr, below_ptr, outptr;

-  INT32 membersum, neighsum, memberscale, neighscale;
+  JPEG_INT32 membersum, neighsum, memberscale, neighscale;

   int colsum, lastcolsum, nextcolsum;
 
   /* Expand input data enough to let all the output samples be generated
   int colsum, lastcolsum, nextcolsum;
 
   /* Expand input data enough to let all the output samples be generated