removed the items we've done

[imager.git] / palimg.c

diff --git a/palimg.c b/palimg.c
index 844bf219aaf7d6e9b11b163d9637081e40d15b94..9ce30f6cb9b9887d609c10cd49146b46615b59cd 100644 (file)
--- a/palimg.c
+++ b/palimg.c
@@ -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 */
@@ -118,8 +118,9 @@ 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));
   return i_img_pal_new_low(im, x, y, channels, maxpal);
 }
 
@@ -244,7 +245,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 +269,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 +289,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,7 +321,7 @@ RGB.
 
 =cut
 */
-int i_plin_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) {
   int ch, count, i;
   i_palidx *data;
   i_palidx which;
@@ -351,7 +352,7 @@ 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, 
+static int i_gsamp_p(i_img *im, int l, int r, int y, i_sample_t *samps, 
               int *chans, int chan_count) {
   int ch;
   if (y >= 0 && y < im->ysize && l < im->xsize && l >= 0) {
@@ -405,7 +406,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 +430,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 +453,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 +475,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 +501,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 +510,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 +519,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 +536,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 +555,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
+*/