support giflib 4.2

[imager.git] / img16.c

diff --git a/img16.c b/img16.c
index 028539d256ccc203406c2c12bd7e29163c77ac93..f44f8b39da79befa6ed2dcdc3b795c52bfeecdac 100644 (file)
--- a/img16.c
+++ b/img16.c
@@ -5,7 +5,7 @@ img16.c - implements 16-bit images
 
 =head1 SYNOPSIS
 
-  i_img *im = i_img_16_new(int x, int y, int channels);
+  i_img *im = i_img_16_new(i_img_dim x, i_img_dim y, int channels);
   # use like a normal image
 
 =head1 DESCRIPTION
@@ -23,22 +23,24 @@ sample image type to work with.
 #include "imager.h"
 #include "imageri.h"
 
-static int i_ppix_d16(i_img *im, int x, int y, const i_color *val);
-static int i_gpix_d16(i_img *im, int x, int y, i_color *val);
-static int i_glin_d16(i_img *im, int l, int r, int y, i_color *vals);
-static int i_plin_d16(i_img *im, int l, int r, int y, const i_color *vals);
-static int i_ppixf_d16(i_img *im, int x, int y, const i_fcolor *val);
-static int i_gpixf_d16(i_img *im, int x, int y, i_fcolor *val);
-static int i_glinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals);
-static int i_plinf_d16(i_img *im, int l, int r, int y, const i_fcolor *vals);
-static int i_gsamp_d16(i_img *im, int l, int r, int y, i_sample_t *samps, 
+static int i_ppix_d16(i_img *im, i_img_dim x, i_img_dim y, const i_color *val);
+static int i_gpix_d16(i_img *im, i_img_dim x, i_img_dim y, i_color *val);
+static i_img_dim i_glin_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals);
+static i_img_dim i_plin_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals);
+static int i_ppixf_d16(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val);
+static int i_gpixf_d16(i_img *im, i_img_dim x, i_img_dim y, i_fcolor *val);
+static i_img_dim i_glinf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals);
+static i_img_dim i_plinf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fcolor *vals);
+static i_img_dim i_gsamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps, 
                        int const *chans, int chan_count);
-static int i_gsampf_d16(i_img *im, int l, int r, int y, i_fsample_t *samps, 
+static i_img_dim i_gsampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samps, 
                         int const *chans, int chan_count);
-static int i_gsamp_bits_d16(i_img *im, int l, int r, int y, unsigned *samps, 
+static i_img_dim i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned *samps, 
                            int const *chans, int chan_count, int bits);
-static int i_psamp_bits_d16(i_img *im, int l, int r, int y, unsigned const *samps, 
+static i_img_dim i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned const *samps, 
                            int const *chans, int chan_count, int bits);
+static i_img_dim i_psamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_sample_t *samps, const int *chans, int chan_count);
+static i_img_dim i_psampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fsample_t *samps, const int *chans, int chan_count);
 
 /*
 =item IIM_base_16bit_direct
@@ -85,6 +87,9 @@ static i_img IIM_base_16bit_direct =
 
   i_gsamp_bits_d16,
   i_psamp_bits_d16,
+
+  i_psamp_d16,
+  i_psampf_d16
 };
 
 /* it's possible some platforms won't have a 16-bit integer type,
@@ -145,7 +150,7 @@ typedef unsigned short i_sample16_t;
 /*
 =item i_img_16_new(x, y, ch)
 
-=category Image creation
+=category Image creation/destruction
 =synopsis i_img *img = i_img_16_new(width, height, channels);
 
 Create a new 16-bit/sample image.
@@ -155,11 +160,12 @@ Returns the image on success, or NULL on failure.
 =cut
 */
 
-i_img *i_img_16_new(int x, int y, int ch) {
+i_img *i_img_16_new(i_img_dim x, i_img_dim y, int ch) {
   i_img *im;
-  int bytes, line_bytes;
+  size_t bytes, line_bytes;
 
-  mm_log((1,"i_img_16_new(x %d, y %d, ch %d)\n", x, y, ch));
+  mm_log((1,"i_img_16_new(x %" i_DF ", y %" i_DF ", ch %d)\n",
+         i_DFc(x), i_DFc(y), ch));
 
   if (x < 1 || y < 1) {
     i_push_error(0, "Image sizes must be positive");
@@ -216,7 +222,7 @@ i_img *
 i_img_to_rgb16(i_img *im) {
   i_img *targ;
   i_fcolor *line;
-  int y;
+  i_img_dim y;
 
   targ = i_img_16_new(im->xsize, im->ysize, im->channels);
   if (!targ)
@@ -232,8 +238,9 @@ i_img_to_rgb16(i_img *im) {
   return targ;
 }
 
-static int i_ppix_d16(i_img *im, int x, int y, const i_color *val) {
-  int off, ch;
+static int i_ppix_d16(i_img *im, i_img_dim x, i_img_dim y, const i_color *val) {
+  i_img_dim off;
+  int ch;
 
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 
     return -1;
@@ -252,8 +259,9 @@ static int i_ppix_d16(i_img *im, int x, int y, const i_color *val) {
   return 0;
 }
 
-static int i_gpix_d16(i_img *im, int x, int y, i_color *val) {
-  int off, ch;
+static int i_gpix_d16(i_img *im, i_img_dim x, i_img_dim y, i_color *val) {
+  i_img_dim off;
+  int ch;
 
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 
     return -1;
@@ -265,8 +273,9 @@ static int i_gpix_d16(i_img *im, int x, int y, i_color *val) {
   return 0;
 }
 
-static int i_ppixf_d16(i_img *im, int x, int y, const i_fcolor *val) {
-  int off, ch;
+static int i_ppixf_d16(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val) {
+  i_img_dim off;
+  int ch;
 
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 
     return -1;
@@ -285,8 +294,9 @@ static int i_ppixf_d16(i_img *im, int x, int y, const i_fcolor *val) {
   return 0;
 }
 
-static int i_gpixf_d16(i_img *im, int x, int y, i_fcolor *val) {
-  int off, ch;
+static int i_gpixf_d16(i_img *im, i_img_dim x, i_img_dim y, i_fcolor *val) {
+  i_img_dim off;
+  int ch;
 
   if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 
     return -1;
@@ -298,9 +308,10 @@ static int i_gpixf_d16(i_img *im, int x, int y, i_fcolor *val) {
   return 0;
 }
 
-static int i_glin_d16(i_img *im, int l, int r, int y, i_color *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_glin_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals) {
+  int ch;
+  i_img_dim count, i;
+  i_img_dim off;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
@@ -319,9 +330,10 @@ static int i_glin_d16(i_img *im, int l, int r, int y, i_color *vals) {
   }
 }
 
-static int i_plin_d16(i_img *im, int l, int r, int y, const i_color *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_plin_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals) {
+  int ch;
+  i_img_dim count, i;
+  i_img_dim off;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
@@ -351,9 +363,10 @@ static int i_plin_d16(i_img *im, int l, int r, int y, const i_color *vals) {
   }
 }
 
-static int i_glinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_glinf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals) {
+  int ch;
+  i_img_dim count, i;
+  i_img_dim off;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
@@ -372,9 +385,10 @@ static int i_glinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals) {
   }
 }
 
-static int i_plinf_d16(i_img *im, int l, int r, int y, const i_fcolor *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_plinf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fcolor *vals) {
+  int ch;
+  i_img_dim count, i;
+  i_img_dim off;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
@@ -404,10 +418,11 @@ static int i_plinf_d16(i_img *im, int l, int r, int y, const i_fcolor *vals) {
   }
 }
 
-static int i_gsamp_d16(i_img *im, int l, int r, int y, i_sample_t *samps, 
+static i_img_dim i_gsamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps, 
                        int const *chans, int chan_count) {
-  int ch, count, i, w;
-  int off;
+  int ch;
+  i_img_dim count, i, w;
+  i_img_dim off;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
@@ -454,10 +469,11 @@ static int i_gsamp_d16(i_img *im, int l, int r, int y, i_sample_t *samps,
   }
 }
 
-static int i_gsampf_d16(i_img *im, int l, int r, int y, i_fsample_t *samps, 
+static i_img_dim i_gsampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samps, 
                         int const *chans, int chan_count) {
-  int ch, count, i, w;
-  int off;
+  int ch;
+  i_img_dim count, i, w;
+  i_img_dim off;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
@@ -504,11 +520,12 @@ static int i_gsampf_d16(i_img *im, int l, int r, int y, i_fsample_t *samps,
   }
 }
 
-static int 
-i_gsamp_bits_d16(i_img *im, int l, int r, int y, unsigned *samps, 
+static i_img_dim 
+i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned *samps, 
                            int const *chans, int chan_count, int bits) {
-  int ch, count, i, w;
-  int off;
+  int ch;
+  i_img_dim count, i, w;
+  i_img_dim off;
 
   if (bits != 16) {
     return i_gsamp_bits_fb(im, l, r, y, samps, chans, chan_count, bits);
@@ -559,11 +576,12 @@ i_gsamp_bits_d16(i_img *im, int l, int r, int y, unsigned *samps,
   }
 }
 
-static int 
-i_psamp_bits_d16(i_img *im, int l, int r, int y, unsigned const *samps, 
+static i_img_dim 
+i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned const *samps, 
                            int const *chans, int chan_count, int bits) {
-  int ch, count, i, w;
-  int off;
+  int ch;
+  i_img_dim count, i, w;
+  i_img_dim off;
 
   if (bits != 16) {
     i_push_error(0, "Invalid bits for 16-bit image");
@@ -619,6 +637,191 @@ i_psamp_bits_d16(i_img *im, int l, int r, int y, unsigned const *samps,
   }
 }
 
+/*
+=item i_psamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_sample_t *samps, int *chans, int chan_count)
+
+Writes sample values to im for the horizontal line (l, y) to (r-1,y)
+for the channels specified by chans, an array of int with chan_count
+elements.
+
+Returns the number of samples written (which should be (r-l) *
+bits_set(chan_mask)
+
+=cut
+*/
+
+static
+i_img_dim
+i_psamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, 
+         const i_sample_t *samps, const int *chans, int chan_count) {
+  int ch;
+  i_img_dim count, i, w;
+
+  if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
+    int all_unmasked;
+    i_img_dim offset;
+    if (r > im->xsize)
+      r = im->xsize;
+    offset = (l+y*im->xsize) * im->channels;
+    w = r - l;
+    count = 0;
+
+    if (chans) {
+      /* make sure we have good channel numbers */
+      /* and test if all channels specified are in the mask */
+      int all_in_mask = 1;
+      for (ch = 0; ch < chan_count; ++ch) {
+        if (chans[ch] < 0 || chans[ch] >= im->channels) {
+          i_push_errorf(0, "No channel %d in this image", chans[ch]);
+          return -1;
+        }
+       if (!((1 << chans[ch]) & im->ch_mask))
+         all_in_mask = 0;
+      }
+      if (all_in_mask) {
+       for (i = 0; i < w; ++i) {
+         for (ch = 0; ch < chan_count; ++ch) {
+           STORE8as16(im->idata, offset + chans[ch], *samps);
+           ++samps;
+           ++count;
+         }
+         offset += im->channels;
+       }
+      }
+      else {
+       for (i = 0; i < w; ++i) {
+         for (ch = 0; ch < chan_count; ++ch) {
+           if (im->ch_mask & (1 << (chans[ch])))
+           STORE8as16(im->idata, offset + chans[ch], *samps);
+           ++samps;
+           ++count;
+         }
+         offset += im->channels;
+       }
+      }
+    }
+    else {
+      if (chan_count <= 0 || chan_count > im->channels) {
+       i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels", 
+                     chan_count);
+       return -1;
+      }
+      for (i = 0; i < w; ++i) {
+       unsigned mask = 1;
+        for (ch = 0; ch < chan_count; ++ch) {
+         if (im->ch_mask & mask)
+           STORE8as16(im->idata, offset + ch, *samps);
+         ++samps;
+          ++count;
+         mask <<= 1;
+        }
+        offset += im->channels;
+      }
+    }
+
+    return count;
+  }
+  else {
+    i_push_error(0, "Image position outside of image");
+    return -1;
+  }
+}
+
+/*
+=item i_psampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fsample_t *samps, int *chans, int chan_count)
+
+Writes sample values to im for the horizontal line (l, y) to (r-1,y)
+for the channels specified by chans, an array of int with chan_count
+elements.
+
+Returns the number of samples written (which should be (r-l) *
+bits_set(chan_mask)
+
+=cut
+*/
+
+static
+i_img_dim
+i_psampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, 
+         const i_fsample_t *samps, const int *chans, int chan_count) {
+  int ch;
+  i_img_dim count, i, w;
+
+  if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
+    int all_unmasked;
+    i_img_dim offset;
+    if (r > im->xsize)
+      r = im->xsize;
+    offset = (l+y*im->xsize) * im->channels;
+    w = r - l;
+    count = 0;
+
+    if (chans) {
+      /* make sure we have good channel numbers */
+      /* and test if all channels specified are in the mask */
+      int all_in_mask = 1;
+      for (ch = 0; ch < chan_count; ++ch) {
+        if (chans[ch] < 0 || chans[ch] >= im->channels) {
+          i_push_errorf(0, "No channel %d in this image", chans[ch]);
+          return -1;
+        }
+       if (!((1 << chans[ch]) & im->ch_mask))
+         all_in_mask = 0;
+      }
+      if (all_in_mask) {
+       for (i = 0; i < w; ++i) {
+         for (ch = 0; ch < chan_count; ++ch) {
+           unsigned samp16 = SampleFTo16(*samps);
+           STORE16(im->idata, offset + chans[ch], samp16);
+           ++samps;
+           ++count;
+         }
+         offset += im->channels;
+       }
+      }
+      else {
+       for (i = 0; i < w; ++i) {
+         for (ch = 0; ch < chan_count; ++ch) {
+           if (im->ch_mask & (1 << (chans[ch]))) {
+             unsigned samp16 = SampleFTo16(*samps);
+             STORE16(im->idata, offset + chans[ch], samp16);
+           }
+           ++samps;
+           ++count;
+         }
+         offset += im->channels;
+       }
+      }
+    }
+    else {
+      if (chan_count <= 0 || chan_count > im->channels) {
+       i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels", 
+                     chan_count);
+       return -1;
+      }
+      for (i = 0; i < w; ++i) {
+       unsigned mask = 1;
+        for (ch = 0; ch < chan_count; ++ch) {
+         if (im->ch_mask & mask) {
+           unsigned samp16 = SampleFTo16(*samps);
+           STORE16(im->idata, offset + ch, samp16);
+         }
+         ++samps;
+          ++count;
+         mask <<= 1;
+        }
+        offset += im->channels;
+      }
+    }
+
+    return count;
+  }
+  else {
+    i_push_error(0, "Image position outside of image");
+    return -1;
+  }
+}
+
 /*
 =back