Updating with Vadim's API changes.

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

diff --git a/src/jpeg/jdmerge.c b/src/jpeg/jdmerge.c
index 2d291955052e90ecb172b36087a6f755b1c9c48d..55eab3621733c9d24da38cff2998424a6696e5a9 100644 (file)
--- a/src/jpeg/jdmerge.c
+++ b/src/jpeg/jdmerge.c
@@ -52,8 +52,8 @@ typedef struct {
   /* Private state for YCC->RGB conversion */
   int * Cr_r_tab;              /* => table for Cr to R conversion */
   int * Cb_b_tab;              /* => table for Cb to B conversion */
   /* Private state for YCC->RGB conversion */
   int * Cr_r_tab;              /* => table for Cr to R conversion */
   int * Cb_b_tab;              /* => table for Cb to B conversion */

-  INT32 * Cr_g_tab;            /* => table for Cr to G conversion */
-  INT32 * Cb_g_tab;            /* => table for Cb to G conversion */
+  JPEG_INT32 * Cr_g_tab;               /* => table for Cr to G conversion */
+  JPEG_INT32 * Cb_g_tab;               /* => table for Cb to G conversion */

 
   /* For 2:1 vertical sampling, we produce two output rows at a time.
    * We need a "spare" row buffer to hold the second output row if the
 
   /* For 2:1 vertical sampling, we produce two output rows at a time.
    * We need a "spare" row buffer to hold the second output row if the


@@ -61,7 +61,7 @@ typedef struct {
    * to discard the dummy last row if the image height is odd.
    */
   JSAMPROW spare_row;
    * to discard the dummy last row if the image height is odd.
    */
   JSAMPROW spare_row;

-  boolean spare_full;          /* T if spare buffer is occupied */
+  wxjpeg_boolean spare_full;           /* T if spare buffer is occupied */

 
   JDIMENSION out_row_width;    /* samples per output row */
   JDIMENSION rows_to_go;       /* counts rows remaining in image */
 
   JDIMENSION out_row_width;    /* samples per output row */
   JDIMENSION rows_to_go;       /* counts rows remaining in image */


@@ -70,8 +70,8 @@ typedef struct {
 typedef my_upsampler * my_upsample_ptr;
 
 #define SCALEBITS      16      /* speediest right-shift on some machines */
 typedef my_upsampler * my_upsample_ptr;
 
 #define SCALEBITS      16      /* speediest right-shift on some machines */

-#define ONE_HALF       ((INT32) 1 << (SCALEBITS-1))
-#define FIX(x)         ((INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+#define ONE_HALF       ((JPEG_INT32) 1 << (SCALEBITS-1))
+#define FIX(x)         ((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))

 
 
 /*
 
 
 /*


@@ -84,7 +84,7 @@ build_ycc_rgb_table (j_decompress_ptr cinfo)
 {
   my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
   int i;
 {
   my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
   int i;

-  INT32 x;
+  JPEG_INT32 x;

   SHIFT_TEMPS
 
   upsample->Cr_r_tab = (int *)
   SHIFT_TEMPS
 
   upsample->Cr_r_tab = (int *)


@@ -93,12 +93,12 @@ build_ycc_rgb_table (j_decompress_ptr cinfo)
   upsample->Cb_b_tab = (int *)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                (MAXJSAMPLE+1) * SIZEOF(int));
   upsample->Cb_b_tab = (int *)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                (MAXJSAMPLE+1) * SIZEOF(int));

-  upsample->Cr_g_tab = (INT32 *)
+  upsample->Cr_g_tab = (JPEG_INT32 *)

     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-                               (MAXJSAMPLE+1) * SIZEOF(INT32));
-  upsample->Cb_g_tab = (INT32 *)
+                               (MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
+  upsample->Cb_g_tab = (JPEG_INT32 *)

     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

-                               (MAXJSAMPLE+1) * SIZEOF(INT32));
+                               (MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));

 
   for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
     /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
 
   for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
     /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */


@@ -237,8 +237,8 @@ h2v1_merged_upsample (j_decompress_ptr cinfo,
   register JSAMPLE * range_limit = cinfo->sample_range_limit;
   int * Crrtab = upsample->Cr_r_tab;
   int * Cbbtab = upsample->Cb_b_tab;
   register JSAMPLE * range_limit = cinfo->sample_range_limit;
   int * Crrtab = upsample->Cr_r_tab;
   int * Cbbtab = upsample->Cb_b_tab;

-  INT32 * Crgtab = upsample->Cr_g_tab;
-  INT32 * Cbgtab = upsample->Cb_g_tab;
+  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
+  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;

   SHIFT_TEMPS
 
   inptr0 = input_buf[0][in_row_group_ctr];
   SHIFT_TEMPS
 
   inptr0 = input_buf[0][in_row_group_ctr];


@@ -298,8 +298,8 @@ h2v2_merged_upsample (j_decompress_ptr cinfo,
   register JSAMPLE * range_limit = cinfo->sample_range_limit;
   int * Crrtab = upsample->Cr_r_tab;
   int * Cbbtab = upsample->Cb_b_tab;
   register JSAMPLE * range_limit = cinfo->sample_range_limit;
   int * Crrtab = upsample->Cr_r_tab;
   int * Cbbtab = upsample->Cb_b_tab;

-  INT32 * Crgtab = upsample->Cr_g_tab;
-  INT32 * Cbgtab = upsample->Cb_g_tab;
+  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
+  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;

   SHIFT_TEMPS
 
   inptr00 = input_buf[0][in_row_group_ctr*2];
   SHIFT_TEMPS
 
   inptr00 = input_buf[0][in_row_group_ctr*2];