initial version

[imager.git] / palimg.c

diff --git a/palimg.c b/palimg.c
index 844bf219aaf7d6e9b11b163d9637081e40d15b94..b655963eb161894e68e480f15777635848c603a1 100644 (file)
--- a/palimg.c
+++ b/palimg.c
@@ -26,7 +26,7 @@ static int i_ppix_p(i_img *im, int x, int y, i_color *val);
 static int i_gpix_p(i_img *im, int x, int y, i_color *val);
 static int i_glin_p(i_img *im, int l, int r, int y, i_color *vals);
 static int i_plin_p(i_img *im, int l, int r, int y, i_color *vals);
-static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, int *chans, int chan_count);
+static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, int const *chans, int chan_count);
 static int i_gpal_p(i_img *pm, int l, int r, int y, i_palidx *vals);
 static int i_ppal_p(i_img *pm, int l, int r, int y, i_palidx *vals);
 static int i_addcolors_p(i_img *im, i_color *color, int count);
@@ -42,7 +42,7 @@ static i_img IIM_base_8bit_pal =
 {
   0, /* channels set */
   0, 0, 0, /* xsize, ysize, bytes */
-  ~0, /* ch_mask */
+  ~0U, /* ch_mask */
   i_8_bits, /* bits */
   i_palette_type, /* type */
   0, /* virtual */
@@ -84,6 +84,7 @@ Currently 0 < maxpal <= 256
 */
 i_img *i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal) {
   i_img_pal_ext *palext;
+  int bytes;
 
   i_clear_error();
   if (maxpal < 0 || maxpal > 256) {
@@ -95,7 +96,12 @@ i_img *i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal) {
     return NULL;
   }
   if (channels < 1 || channels > MAXCHANNELS) {
-    i_push_errorf(0, "Channels must be postive and <= %d", MAXCHANNELS);
+    i_push_errorf(0, "Channels must be positive and <= %d", MAXCHANNELS);
+    return NULL;
+  }
+  bytes = sizeof(i_palidx) * x * y;
+  if (bytes / y / sizeof(i_palidx) != x) {
+    i_push_errorf(0, "integer overflow calculating image allocation");
     return NULL;
   }
 
@@ -107,7 +113,7 @@ i_img *i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal) {
   palext->last_found = -1;
   im->ext_data = palext;
   i_tags_new(&im->tags);
-  im->bytes = sizeof(i_palidx) * x * y;
+  im->bytes = bytes;
   im->idata = mymalloc(im->bytes);
   im->channels = channels;
   memset(im->idata, 0, im->bytes);
@@ -118,9 +124,15 @@ i_img *i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal) {
 }
 
 i_img *i_img_pal_new(int x, int y, int channels, int maxpal) {
-  i_img *im = mymalloc(sizeof(i_img));
+  i_img *im;
+  mm_log((1, "i_img_pal_new(x %d, y %d, channels %d, maxpal %d)\n", x, y, channels, maxpal));
+  im = mymalloc(sizeof(i_img));
+  if (!i_img_pal_new_low(im, x, y, channels, maxpal)) {
+    myfree(im);
+    im = NULL;
+  }
 
-  return i_img_pal_new_low(im, x, y, channels, maxpal);
+  return im;
 }
 
 /*
@@ -158,8 +170,6 @@ The conversion cannot be done for virtual images.
 */
 int i_img_to_rgb_inplace(i_img *im) {
   i_img temp;
-  i_color *pal;
-  int palsize;
 
   if (im->virtual)
     return 0;
@@ -188,20 +198,28 @@ Converts an RGB image to a paletted image
 i_img *i_img_to_pal(i_img *src, i_quantize *quant) {
   i_palidx *result;
   i_img *im;
-  
-  im = i_img_pal_new(src->xsize, src->ysize, src->channels, quant->mc_size);
 
+  i_clear_error();
+  
   quant_makemap(quant, &src, 1);
   result = quant_translate(quant, src);
 
-  /* copy things over */
-  memcpy(im->idata, result, im->bytes);
-  PALEXT(im)->count = quant->mc_count;
-  memcpy(PALEXT(im)->pal, quant->mc_colors, sizeof(i_color) * quant->mc_count);
+  if (result) {
 
-  myfree(result);
+    im = i_img_pal_new(src->xsize, src->ysize, src->channels, quant->mc_size);
 
-  return im;
+    /* copy things over */
+    memcpy(im->idata, result, im->bytes);
+    PALEXT(im)->count = quant->mc_count;
+    memcpy(PALEXT(im)->pal, quant->mc_colors, sizeof(i_color) * quant->mc_count);
+    
+    myfree(result);
+
+    return im;
+  }
+  else {
+    return NULL;
+  }
 }
 
 /*
@@ -244,7 +262,7 @@ present in the image.
 
 =cut
 */
-int i_ppix_p(i_img *im, int x, int y, i_color *val) {
+static int i_ppix_p(i_img *im, int x, int y, i_color *val) {
   i_palidx which;
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
     return -1;
@@ -268,7 +286,7 @@ Retrieve a pixel, converting from a palette index to a color.
 
 =cut
 */
-int i_gpix_p(i_img *im, int x, int y, i_color *val) {
+static int i_gpix_p(i_img *im, int x, int y, i_color *val) {
   i_palidx which;
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
     return -1;
@@ -288,7 +306,7 @@ Retrieve a row of pixels.
 
 =cut
 */
-int i_glin_p(i_img *im, int l, int r, int y, i_color *vals) {
+static int i_glin_p(i_img *im, int l, int r, int y, i_color *vals) {
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     int palsize = PALEXT(im)->count;
     i_color *pal = PALEXT(im)->pal;
@@ -320,8 +338,8 @@ RGB.
 
 =cut
 */
-int i_plin_p(i_img *im, int l, int r, int y, i_color *vals) {
-  int ch, count, i;
+static int i_plin_p(i_img *im, int l, int r, int y, i_color *vals) {
+  int count, i;
   i_palidx *data;
   i_palidx which;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
@@ -351,8 +369,8 @@ int i_plin_p(i_img *im, int l, int r, int y, i_color *vals) {
 
 =cut
 */
-int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, 
-              int *chans, int chan_count) {
+static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, 
+              int const *chans, int chan_count) {
   int ch;
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     int palsize = PALEXT(im)->count;
@@ -405,7 +423,7 @@ int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps,
 =cut
 */
 
-int i_gpal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
+static int i_gpal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     i_palidx *data;
     int i, w;
@@ -429,7 +447,7 @@ int i_gpal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
 =cut
 */
 
-int i_ppal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
+static int i_ppal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     i_palidx *data;
     int i, w;
@@ -452,7 +470,7 @@ int i_ppal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
 
 =cut
 */
-int i_addcolors_p(i_img *im, i_color *color, int count) {
+static int i_addcolors_p(i_img *im, i_color *color, int count) {
   if (PALEXT(im)->count + count <= PALEXT(im)->alloc) {
     int result = PALEXT(im)->count;
     int index = result;
@@ -474,7 +492,7 @@ int i_addcolors_p(i_img *im, i_color *color, int count) {
 
 =cut
 */
-int i_getcolors_p(i_img *im, int i, i_color *color, int count) {
+static int i_getcolors_p(i_img *im, int i, i_color *color, int count) {
   if (i >= 0 && i+count <= PALEXT(im)->count) {
     while (count) {
       *color++ = PALEXT(im)->pal[i++];
@@ -500,7 +518,7 @@ static int color_eq(i_img *im, i_color *c1, i_color *c2) {
 
 =cut
 */
-int i_colorcount_p(i_img *im) {
+static int i_colorcount_p(i_img *im) {
   return PALEXT(im)->count;
 }
 
@@ -509,7 +527,7 @@ int i_colorcount_p(i_img *im) {
 
 =cut
 */
-int i_maxcolors_p(i_img *im) {
+static int i_maxcolors_p(i_img *im) {
   return PALEXT(im)->alloc;
 }
 
@@ -518,7 +536,7 @@ int i_maxcolors_p(i_img *im) {
 
 =cut
 */
-int i_setcolors_p(i_img *im, int index, i_color *colors, int count) {
+static int i_setcolors_p(i_img *im, int index, i_color *colors, int count) {
   if (index >= 0 && count >= 1 && index + count < PALEXT(im)->count) {
     while (count) {
       PALEXT(im)->pal[index++] = *colors++;
@@ -535,7 +553,7 @@ int i_setcolors_p(i_img *im, int index, i_color *colors, int count) {
 
 =cut
 */
-int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry) {
+static int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry) {
   if (PALEXT(im)->count) {
     int i;
     /* often the same color comes up several times in a row */
@@ -554,3 +572,17 @@ int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry) {
   }
   return 0;
 }
+
+/*
+=back
+
+=head1 AUTHOR
+
+Tony Cook <tony@develop-help.com>
+
+=head1 SEE ALSO
+
+Imager(3)
+
+=cut
+*/