avoid a possible sign-extension for offsets/sizes in SGI

[imager.git] / scale.im

diff --git a/scale.im b/scale.im
index dbfb2d11ecaa9dff4ab53f8dad5869ed46669529..5ed637b977c0aeab5c9068067801724dd75e2a73 100644 (file)
--- a/scale.im
+++ b/scale.im
@@ -24,15 +24,15 @@
 
 
 static void
 
 
 static void

-zero_row(i_fcolor *row, int width, int channels);
+zero_row(i_fcolor *row, i_img_dim width, int channels);

 
 #code
 static void
 IM_SUFFIX(accum_output_row)(i_fcolor *accum, double fraction, IM_COLOR const *in,
 
 #code
 static void
 IM_SUFFIX(accum_output_row)(i_fcolor *accum, double fraction, IM_COLOR const *in,

-                int width, int channels);
+                i_img_dim width, int channels);

 static void
 static void

-IM_SUFFIX(horizontal_scale)(IM_COLOR *out, int out_width, 
-                            i_fcolor const *in, int in_width,
+IM_SUFFIX(horizontal_scale)(IM_COLOR *out, i_img_dim out_width, 
+                            i_fcolor const *in, i_img_dim in_width,

                             int channels);
 #/code
 
                             int channels);
 #/code
 


@@ -49,26 +49,27 @@ Adapted from pnmscale.
 =cut
 */
 i_img *
 =cut
 */
 i_img *

-i_scale_mixing(i_img *src, int x_out, int y_out) {
-  i_img *result;
+i_scale_mixing(i_img *src, i_img_dim x_out, i_img_dim y_out) {
+  i_img *result = NULL;

   i_fcolor *accum_row = NULL;
   i_fcolor *accum_row = NULL;

-  int x, y, ch;
-  int accum_row_bytes;
+  i_img_dim x, y;
+  int ch;
+  size_t accum_row_bytes;

   double rowsleft, fracrowtofill;
   double rowsleft, fracrowtofill;

-  int rowsread;
+  i_img_dim rowsread;

   double y_scale;
 
   double y_scale;
 

-  mm_log((1, "i_scale_mixing(src %p, x_out %d, y_out %d)\n", 
-         src, x_out, y_out));
+  mm_log((1, "i_scale_mixing(src %p, out(" i_DFp "))\n", 
+         src, i_DFcp(x_out, y_out)));

 
   i_clear_error();
 
   if (x_out <= 0) {
 
   i_clear_error();
 
   if (x_out <= 0) {

-    i_push_errorf(0, "output width %d invalid", x_out);
+    i_push_errorf(0, "output width %" i_DF " invalid", i_DFc(x_out));

     return NULL;
   }
   if (y_out <= 0) {
     return NULL;
   }
   if (y_out <= 0) {

-    i_push_errorf(0, "output height %d invalid", y_out);
+    i_push_errorf(0, "output height %" i_DF " invalid", i_DFc(y_out));

     return NULL;
   }
 
     return NULL;
   }
 


@@ -78,30 +79,34 @@ i_scale_mixing(i_img *src, int x_out, int y_out) {
 
   y_scale = y_out / (double)src->ysize;
 
 
   y_scale = y_out / (double)src->ysize;
 

-  result = i_sametype_chans(src, x_out, y_out, src->channels);
-  if (!result)
-    return NULL;
-

   accum_row_bytes = sizeof(i_fcolor) * src->xsize;
   if (accum_row_bytes / sizeof(i_fcolor) != src->xsize) {
     i_push_error(0, "integer overflow allocating accumulator row buffer");
     return NULL;
   }
 
   accum_row_bytes = sizeof(i_fcolor) * src->xsize;
   if (accum_row_bytes / sizeof(i_fcolor) != src->xsize) {
     i_push_error(0, "integer overflow allocating accumulator row buffer");
     return NULL;
   }
 

+  result = i_sametype_chans(src, x_out, y_out, src->channels);
+  if (!result)
+    return NULL;
+

   accum_row  = mymalloc(accum_row_bytes);
 
 #code src->bits <= 8
   IM_COLOR *in_row = NULL;
   IM_COLOR *xscale_row = NULL;
   accum_row  = mymalloc(accum_row_bytes);
 
 #code src->bits <= 8
   IM_COLOR *in_row = NULL;
   IM_COLOR *xscale_row = NULL;

-  int in_row_bytes, out_row_bytes;
+  size_t in_row_bytes, out_row_bytes;

 
   in_row_bytes = sizeof(IM_COLOR) * src->xsize;
   if (in_row_bytes / sizeof(IM_COLOR) != src->xsize) {
 
   in_row_bytes = sizeof(IM_COLOR) * src->xsize;
   if (in_row_bytes / sizeof(IM_COLOR) != src->xsize) {

+    myfree(accum_row);
+    i_img_destroy(result);

     i_push_error(0, "integer overflow allocating input row buffer");
     return NULL;
   }
   out_row_bytes = sizeof(IM_COLOR) * x_out;
   if (out_row_bytes / sizeof(IM_COLOR) != x_out) {
     i_push_error(0, "integer overflow allocating input row buffer");
     return NULL;
   }
   out_row_bytes = sizeof(IM_COLOR) * x_out;
   if (out_row_bytes / sizeof(IM_COLOR) != x_out) {

+    myfree(accum_row);
+    i_img_destroy(result);

     i_push_error(0, "integer overflow allocating output row buffer");
     return NULL;
   }
     i_push_error(0, "integer overflow allocating output row buffer");
     return NULL;
   }


@@ -115,7 +120,8 @@ i_scale_mixing(i_img *src, int x_out, int y_out) {
     if (y_out == src->ysize) {
       /* no vertical scaling, just load it */
 #ifdef IM_EIGHT_BIT
     if (y_out == src->ysize) {
       /* no vertical scaling, just load it */
 #ifdef IM_EIGHT_BIT

-      int x, ch;
+      i_img_dim x;
+      int ch;

       /* load and convert to doubles */
       IM_GLIN(src, 0, src->xsize, y, in_row);
       for (x = 0; x < src->xsize; ++x) {
       /* load and convert to doubles */
       IM_GLIN(src, 0, src->xsize, y, in_row);
       for (x = 0; x < src->xsize; ++x) {


@@ -166,7 +172,8 @@ i_scale_mixing(i_img *src, int x_out, int y_out) {
     /* we've accumulated a vertically scaled row */
     if (x_out == src->xsize) {
 #if IM_EIGHT_BIT
     /* we've accumulated a vertically scaled row */
     if (x_out == src->xsize) {
 #if IM_EIGHT_BIT

-      int x, ch;
+      i_img_dim x;
+      int ch;

       /* no need to scale, but we need to convert it */
       if (result->channels == 2 || result->channels == 4) {
        int alpha_chan = result->channels - 1;
       /* no need to scale, but we need to convert it */
       if (result->channels == 2 || result->channels == 4) {
        int alpha_chan = result->channels - 1;


@@ -178,6 +185,17 @@ i_scale_mixing(i_img *src, int x_out, int y_out) {
              xscale_row[x].channel[ch] = IM_LIMIT(val);
            }
          }
              xscale_row[x].channel[ch] = IM_LIMIT(val);
            }
          }

+         else {
+           /* rather than leaving any color data as whatever was
+              originally in the buffer, set it to black.  This isn't
+              any more correct, but it gives us more compressible
+              image data.
+              RT #32324
+           */
+           for (ch = 0; ch < alpha_chan; ++ch) {
+             xscale_row[x].channel[ch] = 0;
+           }
+         }

          xscale_row[x].channel[alpha_chan] = IM_LIMIT(accum_row[x].channel[alpha_chan]+0.5);
        }
       }
          xscale_row[x].channel[alpha_chan] = IM_LIMIT(accum_row[x].channel[alpha_chan]+0.5);
        }
       }


@@ -207,8 +225,8 @@ i_scale_mixing(i_img *src, int x_out, int y_out) {
 }
 
 static void
 }
 
 static void

-zero_row(i_fcolor *row, int width, int channels) {
-  int x;
+zero_row(i_fcolor *row, i_img_dim width, int channels) {
+  i_img_dim x;

   int ch;
 
   /* with IEEE floats we could just use memset() but that's not
   int ch;
 
   /* with IEEE floats we could just use memset() but that's not


@@ -225,8 +243,9 @@ zero_row(i_fcolor *row, int width, int channels) {
 
 static void
 IM_SUFFIX(accum_output_row)(i_fcolor *accum, double fraction, IM_COLOR const *in,
 
 static void
 IM_SUFFIX(accum_output_row)(i_fcolor *accum, double fraction, IM_COLOR const *in,

-                int width, int channels) {
-  int x, ch;
+                i_img_dim width, int channels) {
+  i_img_dim x;
+  int ch;

 
   /* it's tempting to change this into a pointer iteration loop but
      modern CPUs do the indexing as part of the instruction */
 
   /* it's tempting to change this into a pointer iteration loop but
      modern CPUs do the indexing as part of the instruction */


@@ -248,12 +267,12 @@ IM_SUFFIX(accum_output_row)(i_fcolor *accum, double fraction, IM_COLOR const *in
 }
 
 static void
 }
 
 static void

-IM_SUFFIX(horizontal_scale)(IM_COLOR *out, int out_width, 
-                i_fcolor const *in, int in_width,
+IM_SUFFIX(horizontal_scale)(IM_COLOR *out, i_img_dim out_width, 
+                i_fcolor const *in, i_img_dim in_width,

                 int channels) {
   double frac_col_to_fill, frac_col_left;
                 int channels) {
   double frac_col_to_fill, frac_col_left;

-  int in_x;
-  int out_x;
+  i_img_dim in_x;
+  i_img_dim out_x;

   double x_scale = (double)out_width / in_width;
   int ch;
   double accum[MAXCHANNELS] = { 0 };
   double x_scale = (double)out_width / in_width;
   int ch;
   double accum[MAXCHANNELS] = { 0 };


@@ -275,6 +294,12 @@ IM_SUFFIX(horizontal_scale)(IM_COLOR *out, int out_width,
            out[out_x].channel[ch] = IM_LIMIT(val);
          }
        }
            out[out_x].channel[ch] = IM_LIMIT(val);
          }
        }

+       else {
+         for (ch = 0; ch < alpha_chan; ++ch) {
+           /* See RT #32324 (and mention above) */
+           out[out_x].channel[ch] = 0;
+         }
+       }

        out[out_x].channel[alpha_chan] = IM_LIMIT(IM_ROUND(accum[alpha_chan]));
       }
       else {
        out[out_x].channel[alpha_chan] = IM_LIMIT(IM_ROUND(accum[alpha_chan]));
       }
       else {


@@ -315,6 +340,12 @@ IM_SUFFIX(horizontal_scale)(IM_COLOR *out, int out_width,
          out[out_x].channel[ch] = IM_LIMIT(val);
        }
       }
          out[out_x].channel[ch] = IM_LIMIT(val);
        }
       }

+      else {
+       for (ch = 0; ch < alpha_chan; ++ch) {
+         /* See RT #32324 (and mention above) */
+         out[out_x].channel[ch] = 0;
+       }
+      }

       out[out_x].channel[alpha_chan] = IM_LIMIT(IM_ROUND(accum[alpha_chan]));
     }
     else {
       out[out_x].channel[alpha_chan] = IM_LIMIT(IM_ROUND(accum[alpha_chan]));
     }
     else {