allow Imager to be loaded on Windows 98

[imager.git] / palimg.c

diff --git a/palimg.c b/palimg.c
index be5858adc3f385dba73f2851f5dff5f5d02d30b5..261325954f2025d5546ff5518c3562a130caee0e 100644 (file)
--- a/palimg.c
+++ b/palimg.c
@@ -18,23 +18,23 @@ Basic 8-bit/sample paletted image
 =cut
 */
 
 =cut
 */
 

-#include "image.h"
-#include "imagei.h"
+#include "imager.h"
+#include "imageri.h"

 
 #define PALEXT(im) ((i_img_pal_ext*)((im)->ext_data))
 
 #define PALEXT(im) ((i_img_pal_ext*)((im)->ext_data))

-static 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, const 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_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_plin_p(i_img *im, int l, int r, int y, const i_color *vals);
+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_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);
+static int i_ppal_p(i_img *pm, int l, int r, int y, const i_palidx *vals);
+static int i_addcolors_p(i_img *im, const i_color *color, int count);

 static int i_getcolors_p(i_img *im, int i, i_color *color, int count);
 static int i_colorcount_p(i_img *im);
 static int i_maxcolors_p(i_img *im);
 static int i_getcolors_p(i_img *im, int i, i_color *color, int count);
 static int i_colorcount_p(i_img *im);
 static int i_maxcolors_p(i_img *im);

-static int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry);
-static int i_setcolors_p(i_img *im, int index, i_color *color, int count);
+static int i_findcolor_p(i_img *im, const i_color *color, i_palidx *entry);
+static int i_setcolors_p(i_img *im, int index, const i_color *color, int count);

 
 static void i_destroy_p(i_img *im);
 
 
 static void i_destroy_p(i_img *im);
 


@@ -74,7 +74,7 @@ static i_img IIM_base_8bit_pal =
 };
 
 /*
 };
 
 /*

-=item i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal)
+=item i_img_pal_new_low(im, x, y, channels, maxpal)

 
 Creates a new paletted image.
 
 
 Creates a new paletted image.
 


@@ -84,9 +84,10 @@ 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;
 */
 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, line_bytes;

 
   i_clear_error();
 
   i_clear_error();

-  if (maxpal < 0 || maxpal > 256) {
+  if (maxpal < 1 || maxpal > 256) {

     i_push_error(0, "Maximum of 256 palette entries");
     return NULL;
   }
     i_push_error(0, "Maximum of 256 palette entries");
     return NULL;
   }


@@ -95,7 +96,21 @@ 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) {
     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_error(0, "integer overflow calculating image allocation");
+    return NULL;
+  }
+
+  /* basic assumption: we can always allocate a buffer representing a
+     line from the image, otherwise we're going to have trouble
+     working with the image */
+  line_bytes = sizeof(i_color) * x;
+  if (line_bytes / x != sizeof(i_color)) {
+    i_push_error(0, "integer overflow calculating scanline allocation");

     return NULL;
   }
 
     return NULL;
   }
 


@@ -107,7 +122,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);
   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);
   im->idata = mymalloc(im->bytes);
   im->channels = channels;
   memset(im->idata, 0, im->bytes);


@@ -117,10 +132,28 @@ i_img *i_img_pal_new_low(i_img *im, int x, int y, int channels, int maxpal) {
   return im;
 }
 
   return im;
 }
 

+/*
+=item i_img_pal_new(x, y, channels, maxpal)
+
+=category Image creation
+
+Creates a new paletted image of the supplied dimensions.
+
+Returns a new image or NULL on failure.
+
+=cut
+*/
+

 i_img *i_img_pal_new(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 +191,6 @@ The conversion cannot be done for virtual images.
 */
 int i_img_to_rgb_inplace(i_img *im) {
   i_img temp;
 */
 int i_img_to_rgb_inplace(i_img *im) {
   i_img temp;

-  i_color *pal;
-  int palsize;

 
   if (im->virtual)
     return 0;
 
   if (im->virtual)
     return 0;


@@ -188,20 +219,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;
 i_img *i_img_to_pal(i_img *src, i_quantize *quant) {
   i_palidx *result;
   i_img *im;

+
+  i_clear_error();

   
   

-  im = i_img_pal_new(src->xsize, src->ysize, src->channels, quant->mc_size);
+  i_quant_makemap(quant, &src, 1);
+  result = i_quant_translate(quant, src);

 
 

-  quant_makemap(quant, &src, 1);
-  result = quant_translate(quant, src);
+  if (result) {

 
 

-  /* 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);
+    im = i_img_pal_new(src->xsize, src->ysize, src->channels, quant->mc_size);

 
 

-  myfree(result);
+    /* 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;
+    return im;
+  }
+  else {
+    return NULL;
+  }

 }
 
 /*
 }
 
 /*


@@ -235,7 +274,7 @@ static void i_destroy_p(i_img *im) {
 }
 
 /*
 }
 
 /*

-=item i_ppix_p(i_img *im, int x, int y, i_color *val)
+=item i_ppix_p(i_img *im, int x, int y, const i_color *val)

 
 Write to a pixel in the image.
 
 
 Write to a pixel in the image.
 


@@ -244,7 +283,8 @@ present in the image.
 
 =cut
 */
 
 =cut
 */

-static 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, const i_color *val) {

   i_palidx which;
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
     return -1;
   i_palidx which;
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
     return -1;


@@ -262,7 +302,7 @@ static int i_ppix_p(i_img *im, int x, int y, i_color *val) {
 }
 
 /*
 }
 
 /*

-=item i_gpix(i_img *im, int x, int y, i_color *val)
+=item i_gpix_p(i_img *im, int x, int y, i_color *val)

 
 Retrieve a pixel, converting from a palette index to a color.
 
 
 Retrieve a pixel, converting from a palette index to a color.
 


@@ -311,7 +351,7 @@ static int i_glin_p(i_img *im, int l, int r, int y, i_color *vals) {
 }
 
 /*
 }
 
 /*

-=item i_plin_p(i_img *im, int l, int r, int y, i_color *vals)
+=item i_plin_p(i_img *im, int l, int r, int y, const i_color *vals)

 
 Write a line of color data to the image.
 
 
 Write a line of color data to the image.
 


@@ -320,8 +360,9 @@ RGB.
 
 =cut
 */
 
 =cut
 */

-static 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, const i_color *vals) {
+  int count, i;

   i_palidx *data;
   i_palidx which;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
   i_palidx *data;
   i_palidx which;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {


@@ -352,7 +393,7 @@ static int i_plin_p(i_img *im, int l, int r, int y, i_color *vals) {
 =cut
 */
 static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, 
 =cut
 */
 static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, 

-              int *chans, int chan_count) {
+              int const *chans, int chan_count) {

   int ch;
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     int palsize = PALEXT(im)->count;
   int ch;
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     int palsize = PALEXT(im)->count;


@@ -424,12 +465,12 @@ static int i_gpal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
 }
 
 /*
 }
 
 /*

-=item i_ppal_p(i_img *im, int l, int r, int y, i_palidx *vals)
+=item i_ppal_p(i_img *im, int l, int r, int y, const i_palidx *vals)

 
 =cut
 */
 
 
 =cut
 */
 

-static 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, const i_palidx *vals) {

   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     i_palidx *data;
     int i, w;
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
     i_palidx *data;
     int i, w;


@@ -448,11 +489,11 @@ static int i_ppal_p(i_img *im, int l, int r, int y, i_palidx *vals) {
 }
 
 /*
 }
 
 /*

-=item i_addcolors_p(i_img *im, i_color *color, int count)
+=item i_addcolors_p(i_img *im, const i_color *color, int count)

 
 =cut
 */
 
 =cut
 */

-static int i_addcolors_p(i_img *im, i_color *color, int count) {
+static int i_addcolors_p(i_img *im, const i_color *color, int count) {

   if (PALEXT(im)->count + count <= PALEXT(im)->alloc) {
     int result = PALEXT(im)->count;
     int index = result;
   if (PALEXT(im)->count + count <= PALEXT(im)->alloc) {
     int result = PALEXT(im)->count;
     int index = result;


@@ -486,7 +527,7 @@ static int i_getcolors_p(i_img *im, int i, i_color *color, int count) {
     return 0;
 }
 
     return 0;
 }
 

-static int color_eq(i_img *im, i_color *c1, i_color *c2) {
+static int color_eq(i_img *im, const i_color *c1, const i_color *c2) {

   int ch;
   for (ch = 0; ch < im->channels; ++ch) {
     if (c1->channel[ch] != c2->channel[ch])
   int ch;
   for (ch = 0; ch < im->channels; ++ch) {
     if (c1->channel[ch] != c2->channel[ch])


@@ -514,12 +555,12 @@ static int i_maxcolors_p(i_img *im) {
 }
 
 /*
 }
 
 /*

-=item i_setcolors_p(i_img *im, int index, i_color *colors, int count)
+=item i_setcolors_p(i_img *im, int index, const i_color *colors, int count)

 
 =cut
 */
 
 =cut
 */

-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) {
+static int i_setcolors_p(i_img *im, int index, const i_color *colors, int count) {
+  if (index >= 0 && count >= 1 && index + count <= PALEXT(im)->count) {

     while (count) {
       PALEXT(im)->pal[index++] = *colors++;
       --count;
     while (count) {
       PALEXT(im)->pal[index++] = *colors++;
       --count;


@@ -535,7 +576,7 @@ static int i_setcolors_p(i_img *im, int index, i_color *colors, int count) {
 
 =cut
 */
 
 =cut
 */

-static int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry) {
+static int i_findcolor_p(i_img *im, const i_color *color, i_palidx *entry) {

   if (PALEXT(im)->count) {
     int i;
     /* often the same color comes up several times in a row */
   if (PALEXT(im)->count) {
     int i;
     /* often the same color comes up several times in a row */


@@ -554,3 +595,17 @@ static int i_findcolor_p(i_img *im, i_color *color, i_palidx *entry) {
   }
   return 0;
 }
   }
   return 0;
 }

+
+/*
+=back
+
+=head1 AUTHOR
+
+Tony Cook <tony@develop-help.com>
+
+=head1 SEE ALSO
+
+Imager(3)
+
+=cut
+*/