fixed to not duplicate code needlessly; clarified why gtk_file_chooser_set_current_na...

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

diff --git a/src/jpeg/jccolor.c b/src/jpeg/jccolor.c
index 0a8a4b5d13c303c4d14cd5b4333adcbb3cfcc4a2..2f74cc2a39313baf44930cc55467bbccba330619 100644 (file)
--- a/src/jpeg/jccolor.c
+++ b/src/jpeg/jccolor.c
@@ -19,7 +19,7 @@ typedef struct {
   struct jpeg_color_converter pub; /* public fields */
 
   /* Private state for RGB->YCC conversion */
   struct jpeg_color_converter pub; /* public fields */
 
   /* Private state for RGB->YCC conversion */

-  INT32 * rgb_ycc_tab;         /* => table for RGB to YCbCr conversion */
+  JPEG_INT32 * rgb_ycc_tab;            /* => table for RGB to YCbCr conversion */

 } my_color_converter;
 
 typedef my_color_converter * my_cconvert_ptr;
 } my_color_converter;
 
 typedef my_color_converter * my_cconvert_ptr;


@@ -56,9 +56,9 @@ typedef my_color_converter * my_cconvert_ptr;
  */
 
 #define SCALEBITS      16      /* speediest right-shift on some machines */
  */
 
 #define SCALEBITS      16      /* speediest right-shift on some machines */

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

 
 /* We allocate one big table and divide it up into eight parts, instead of
  * doing eight alloc_small requests.  This lets us use a single table base
 
 /* We allocate one big table and divide it up into eight parts, instead of
  * doing eight alloc_small requests.  This lets us use a single table base


@@ -86,13 +86,13 @@ METHODDEF(void)
 rgb_ycc_start (j_compress_ptr cinfo)
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
 rgb_ycc_start (j_compress_ptr cinfo)
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;

-  INT32 * rgb_ycc_tab;
-  INT32 i;
+  JPEG_INT32 * rgb_ycc_tab;
+  JPEG_INT32 i;

 
   /* Allocate and fill in the conversion tables. */
 
   /* Allocate and fill in the conversion tables. */

-  cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *)
+  cconvert->rgb_ycc_tab = rgb_ycc_tab = (JPEG_INT32 *)

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

-                               (TABLE_SIZE * SIZEOF(INT32)));
+                               (TABLE_SIZE * SIZEOF(JPEG_INT32)));

 
   for (i = 0; i <= MAXJSAMPLE; i++) {
     rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;
 
   for (i = 0; i <= MAXJSAMPLE; i++) {
     rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;


@@ -133,7 +133,7 @@ rgb_ycc_convert (j_compress_ptr cinfo,
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;

   register JSAMPROW inptr;
   register JSAMPROW outptr0, outptr1, outptr2;
   register JDIMENSION col;
   register JSAMPROW inptr;
   register JSAMPROW outptr0, outptr1, outptr2;
   register JDIMENSION col;


@@ -189,7 +189,7 @@ rgb_gray_convert (j_compress_ptr cinfo,
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;

   register JSAMPROW inptr;
   register JSAMPROW outptr;
   register JDIMENSION col;
   register JSAMPROW inptr;
   register JSAMPROW outptr;
   register JDIMENSION col;


@@ -228,7 +228,7 @@ cmyk_ycck_convert (j_compress_ptr cinfo,
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;
 {
   my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   register int r, g, b;

-  register INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;

   register JSAMPROW inptr;
   register JSAMPROW outptr0, outptr1, outptr2, outptr3;
   register JDIMENSION col;
   register JSAMPROW inptr;
   register JSAMPROW outptr0, outptr1, outptr2, outptr3;
   register JDIMENSION col;