avoid warning about gccversion being non-numeric

[imager.git] / imgdouble.c

diff --git a/imgdouble.c b/imgdouble.c
index 90587820a52bb8a7baf020434494f518888b9dc5..c6b2a5bbad1339174f8df8f631f4513b87a2b36e 100644 (file)
--- a/imgdouble.c
+++ b/imgdouble.c
@@ -5,7 +5,7 @@ imgdouble.c - implements double per sample images
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-  i_img *im = i_img_double_new(int x, int y, int channels);
+  i_img *im = i_img_double_new(width, height, channels);

   # use like a normal image
 
 =head1 DESCRIPTION
   # use like a normal image
 
 =head1 DESCRIPTION


@@ -20,20 +20,20 @@ sample image type to work with.
 =cut
 */
 
 =cut
 */
 

-#include "image.h"
-#include "imagei.h"
-
-static int i_ppix_ddoub(i_img *im, int x, int y, i_color *val);
-static int i_gpix_ddoub(i_img *im, int x, int y, i_color *val);
-static int i_glin_ddoub(i_img *im, int l, int r, int y, i_color *vals);
-static int i_plin_ddoub(i_img *im, int l, int r, int y, i_color *vals);
-static int i_ppixf_ddoub(i_img *im, int x, int y, i_fcolor *val);
-static int i_gpixf_ddoub(i_img *im, int x, int y, i_fcolor *val);
-static int i_glinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals);
-static int i_plinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals);
-static int i_gsamp_ddoub(i_img *im, int l, int r, int y, i_sample_t *samps, 
+#include "imager.h"
+#include "imageri.h"
+
+static int i_ppix_ddoub(i_img *im, i_img_dim x, i_img_dim y, const i_color *val);
+static int i_gpix_ddoub(i_img *im, i_img_dim x, i_img_dim y, i_color *val);
+static i_img_dim i_glin_ddoub(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals);
+static i_img_dim i_plin_ddoub(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals);
+static int i_ppixf_ddoub(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val);
+static int i_gpixf_ddoub(i_img *im, i_img_dim x, i_img_dim y, i_fcolor *val);
+static i_img_dim i_glinf_ddoub(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals);
+static i_img_dim i_plinf_ddoub(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_ddoub(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 const *chans, int chan_count);

-static int i_gsampf_ddoub(i_img *im, int l, int r, int y, i_fsample_t *samps, 
+static i_img_dim i_gsampf_ddoub(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 const *chans, int chan_count);
 
 /*


@@ -70,76 +70,90 @@ static i_img IIM_base_double_direct =
 
   NULL, /* i_f_gpal */
   NULL, /* i_f_ppal */
 
   NULL, /* i_f_gpal */
   NULL, /* i_f_ppal */

-  NULL, /* i_f_addcolor */
-  NULL, /* i_f_getcolor */
+  NULL, /* i_f_addcolors */
+  NULL, /* i_f_getcolors */

   NULL, /* i_f_colorcount */
   NULL, /* i_f_colorcount */

+  NULL, /* i_f_maxcolors */

   NULL, /* i_f_findcolor */
   NULL, /* i_f_findcolor */

+  NULL, /* i_f_setcolors */

 
   NULL, /* i_f_destroy */
 
   NULL, /* i_f_destroy */

+
+  i_gsamp_bits_fb,
+  NULL, /* i_f_psamp_bits */

 };
 
 /*
 };
 
 /*

-=item i_img_double_new(int x, int y, int ch)
+=item i_img_double_new(i_img_dim x, i_img_dim y, int ch)
+=category Image creation/destruction
+=synopsis i_img *img = i_img_double_new(width, height, channels);

 
 Creates a new double per sample image.
 
 =cut
 */
 
 Creates a new double per sample image.
 
 =cut
 */

-i_img *i_img_double_new_low(i_img *im, int x, int y, int ch) {
-  mm_log((1,"i_img_double_new(x %d, y %d, ch %d)\n", x, y, ch));
+i_img *i_img_double_new(i_img_dim x, i_img_dim y, int ch) {
+  size_t bytes;
+  i_img *im;
+
+  mm_log((1,"i_img_double_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");
+    return NULL;
+  }
+  if (ch < 1 || ch > MAXCHANNELS) {
+    i_push_errorf(0, "channels must be between 1 and %d", MAXCHANNELS);
+    return NULL;
+  }
+  bytes = x * y * ch * sizeof(double);
+  if (bytes / y / ch / sizeof(double) != x) {
+    i_push_errorf(0, "integer overflow calculating image allocation");
+    return NULL;
+  }

   
   

+  im = i_img_alloc();

   *im = IIM_base_double_direct;
   i_tags_new(&im->tags);
   im->xsize = x;
   im->ysize = y;
   im->channels = ch;
   *im = IIM_base_double_direct;
   i_tags_new(&im->tags);
   im->xsize = x;
   im->ysize = y;
   im->channels = ch;

-  im->bytes = x * y * ch * sizeof(double);
+  im->bytes = bytes;

   im->ext_data = NULL;
   im->idata = mymalloc(im->bytes);
   im->ext_data = NULL;
   im->idata = mymalloc(im->bytes);

-  if (im->idata) {
-    memset(im->idata, 0, im->bytes);
-  }
-  else {
-    i_tags_destroy(&im->tags);
-    im = NULL;
-  }
+  memset(im->idata, 0, im->bytes);
+  i_img_init(im);

   
   return im;
 }
 
   
   return im;
 }
 

-i_img *i_img_double_new(int x, int y, int ch) {
-  i_img *im;
+static int i_ppix_ddoub(i_img *im, i_img_dim x, i_img_dim y, const i_color *val) {
+  i_img_dim off;
+  int ch;

 
 

-  im = mymalloc(sizeof(i_img));
-  if (im) {
-    if (!i_img_double_new_low(im, x, y, ch)) {
-      myfree(im);
-      im = NULL;
-    }
-  }
-  
-  mm_log((1, "(%p) <- i_img_double_new\n", im));
-  
-  return im;
-}
-
-static int i_ppix_ddoub(i_img *im, int x, int y, i_color *val) {
-  int off, ch;
-
-  if (x < 0 || x >= im->xsize || y < 0 || y > im->ysize) 
+  if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 

     return -1;
 
   off = (x + y * im->xsize) * im->channels;
     return -1;
 
   off = (x + y * im->xsize) * im->channels;

-  for (ch = 0; ch < im->channels; ++ch)
-    ((double*)im->idata)[off+ch] = Sample8ToF(val->channel[ch]);
+  if (I_ALL_CHANNELS_WRITABLE(im)) {
+    for (ch = 0; ch < im->channels; ++ch)
+      ((double*)im->idata)[off+ch] = Sample8ToF(val->channel[ch]);
+  }
+  else {
+    for (ch = 0; ch < im->channels; ++ch)
+      if (im->ch_mask & (1<<ch))
+       ((double*)im->idata)[off+ch] = Sample8ToF(val->channel[ch]);
+  }

 
   return 0;
 }
 
 
   return 0;
 }
 

-static int i_gpix_ddoub(i_img *im, int x, int y, i_color *val) {
-  int off, ch;
+static int i_gpix_ddoub(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) 
+  if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 

     return -1;
 
   off = (x + y * im->xsize) * im->channels;
     return -1;
 
   off = (x + y * im->xsize) * im->channels;


@@ -149,23 +163,32 @@ static int i_gpix_ddoub(i_img *im, int x, int y, i_color *val) {
   return 0;
 }
 
   return 0;
 }
 

-static int i_ppixf_ddoub(i_img *im, int x, int y, i_fcolor *val) {
-  int off, ch;
+static int i_ppixf_ddoub(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) 
+  if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 

     return -1;
 
   off = (x + y * im->xsize) * im->channels;
     return -1;
 
   off = (x + y * im->xsize) * im->channels;

-  for (ch = 0; ch < im->channels; ++ch)
-    ((double *)im->idata)[off+ch] = val->channel[ch];;
+  if (I_ALL_CHANNELS_WRITABLE(im)) {
+    for (ch = 0; ch < im->channels; ++ch)
+      ((double *)im->idata)[off+ch] = val->channel[ch];
+  }
+  else {
+    for (ch = 0; ch < im->channels; ++ch)
+      if (im->ch_mask & (1 << ch))
+       ((double *)im->idata)[off+ch] = val->channel[ch];
+  }

 
   return 0;
 }
 
 
   return 0;
 }
 

-static int i_gpixf_ddoub(i_img *im, int x, int y, i_fcolor *val) {
-  int off, ch;
+static int i_gpixf_ddoub(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) 
+  if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) 

     return -1;
 
   off = (x + y * im->xsize) * im->channels;
     return -1;
 
   off = (x + y * im->xsize) * im->channels;


@@ -175,9 +198,10 @@ static int i_gpixf_ddoub(i_img *im, int x, int y, i_fcolor *val) {
   return 0;
 }
 
   return 0;
 }
 

-static int i_glin_ddoub(i_img *im, int l, int r, int y, i_color *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_glin_ddoub(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;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;


@@ -196,18 +220,30 @@ static int i_glin_ddoub(i_img *im, int l, int r, int y, i_color *vals) {
   }
 }
 
   }
 }
 

-static int i_plin_ddoub(i_img *im, int l, int r, int y, i_color *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_plin_ddoub(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;
     off = (l+y*im->xsize) * im->channels;
     count = r - l;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
     off = (l+y*im->xsize) * im->channels;
     count = r - l;

-    for (i = 0; i < count; ++i) {
-      for (ch = 0; ch < im->channels; ++ch) {
-        ((double *)im->idata)[off] = Sample8ToF(vals[i].channel[ch]);
-        ++off;
+    if (I_ALL_CHANNELS_WRITABLE(im)) {
+      for (i = 0; i < count; ++i) {
+       for (ch = 0; ch < im->channels; ++ch) {
+         ((double *)im->idata)[off] = Sample8ToF(vals[i].channel[ch]);
+         ++off;
+       }
+      }
+    }
+    else {
+      for (i = 0; i < count; ++i) {
+       for (ch = 0; ch < im->channels; ++ch) {
+         if (im->ch_mask & (1 << ch))
+           ((double *)im->idata)[off] = Sample8ToF(vals[i].channel[ch]);
+         ++off;
+       }

       }
     }
     return count;
       }
     }
     return count;


@@ -217,9 +253,10 @@ static int i_plin_ddoub(i_img *im, int l, int r, int y, i_color *vals) {
   }
 }
 
   }
 }
 

-static int i_glinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_glinf_ddoub(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;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;


@@ -238,18 +275,30 @@ static int i_glinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals) {
   }
 }
 
   }
 }
 

-static int i_plinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals) {
-  int ch, count, i;
-  int off;
+static i_img_dim i_plinf_ddoub(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;
     off = (l+y*im->xsize) * im->channels;
     count = r - l;
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)
       r = im->xsize;
     off = (l+y*im->xsize) * im->channels;
     count = r - l;

-    for (i = 0; i < count; ++i) {
-      for (ch = 0; ch < im->channels; ++ch) {
-        ((double *)im->idata)[off] = vals[i].channel[ch];
-        ++off;
+    if (I_ALL_CHANNELS_WRITABLE(im)) {
+      for (i = 0; i < count; ++i) {
+       for (ch = 0; ch < im->channels; ++ch) {
+         ((double *)im->idata)[off] = vals[i].channel[ch];
+         ++off;
+       }
+      }
+    }
+    else {
+      for (i = 0; i < count; ++i) {
+       for (ch = 0; ch < im->channels; ++ch) {
+         if (im->ch_mask & (1 << ch))
+           ((double *)im->idata)[off] = vals[i].channel[ch];
+         ++off;
+       }

       }
     }
     return count;
       }
     }
     return count;


@@ -259,10 +308,11 @@ static int i_plinf_ddoub(i_img *im, int l, int r, int y, i_fcolor *vals) {
   }
 }
 
   }
 }
 

-static int i_gsamp_ddoub(i_img *im, int l, int r, int y, i_sample_t *samps, 
+static i_img_dim i_gsamp_ddoub(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 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)
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)


@@ -288,6 +338,11 @@ static int i_gsamp_ddoub(i_img *im, int l, int r, int y, i_sample_t *samps,
       }
     }
     else {
       }
     }
     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 0;
+      }

       for (i = 0; i < w; ++i) {
         for (ch = 0; ch < chan_count; ++ch) {
           *samps++ = SampleFTo8(((double *)im->idata)[off+ch]);
       for (i = 0; i < w; ++i) {
         for (ch = 0; ch < chan_count; ++ch) {
           *samps++ = SampleFTo8(((double *)im->idata)[off+ch]);


@@ -304,10 +359,11 @@ static int i_gsamp_ddoub(i_img *im, int l, int r, int y, i_sample_t *samps,
   }
 }
 
   }
 }
 

-static int i_gsampf_ddoub(i_img *im, int l, int r, int y, i_fsample_t *samps, 
+static i_img_dim i_gsampf_ddoub(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 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)
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
     if (r > im->xsize)


@@ -333,6 +389,11 @@ static int i_gsampf_ddoub(i_img *im, int l, int r, int y, i_fsample_t *samps,
       }
     }
     else {
       }
     }
     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 0;
+      }

       for (i = 0; i < w; ++i) {
         for (ch = 0; ch < chan_count; ++ch) {
           *samps++ = ((double *)im->idata)[off+ch];
       for (i = 0; i < w; ++i) {
         for (ch = 0; ch < chan_count; ++ch) {
           *samps++ = ((double *)im->idata)[off+ch];


@@ -349,6 +410,37 @@ static int i_gsampf_ddoub(i_img *im, int l, int r, int y, i_fsample_t *samps,
   }
 }
 
   }
 }
 

+/*
+=item i_img_to_drgb(im)
+
+=category Image creation
+
+Returns a double/sample version of the supplied image.
+
+Returns the image on success, or NULL on failure.
+
+=cut
+*/
+
+i_img *
+i_img_to_drgb(i_img *im) {
+  i_img *targ;
+  i_fcolor *line;
+  i_img_dim y;
+
+  targ = i_img_double_new(im->xsize, im->ysize, im->channels);
+  if (!targ)
+    return NULL;
+  line = mymalloc(sizeof(i_fcolor) * im->xsize);
+  for (y = 0; y < im->ysize; ++y) {
+    i_glinf(im, 0, im->xsize, y, line);
+    i_plinf(targ, 0, im->xsize, y, line);
+  }
+
+  myfree(line);
+
+  return targ;
+}

 
 /*
 =back
 
 /*
 =back