add new comparison method rgb_difference that resembles arithmetical difference per...

[imager.git] / img16.c

diff --git a/img16.c b/img16.c
index 267c1d6bc8129d9e6d4ddd36b8096223205d867a..1b3e45212cbbfa67ccda868f42eb356124bf66d6 100644 (file)
--- a/img16.c
+++ b/img16.c
@@ -20,6 +20,8 @@ sample image type to work with.
 =cut
 */
 
 =cut
 */
 

+#define IMAGER_NO_CONTEXT
+

 #include "imager.h"
 #include "imageri.h"
 
 #include "imager.h"
 #include "imageri.h"
 


@@ -39,6 +41,8 @@ static i_img_dim i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim
                            int const *chans, int chan_count, int bits);
 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 const *chans, int chan_count, int bits);
 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
 
 /*
 =item IIM_base_16bit_direct


@@ -85,6 +89,9 @@ static i_img IIM_base_16bit_direct =
 
   i_gsamp_bits_d16,
   i_psamp_bits_d16,
 
   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,
 };
 
 /* it's possible some platforms won't have a 16-bit integer type,


@@ -143,36 +150,40 @@ typedef unsigned short i_sample16_t;
      ((((i_sample16_t *)(bytes))[offset]+127) / 257)
 
 /*
      ((((i_sample16_t *)(bytes))[offset]+127) / 257)
 
 /*

-=item i_img_16_new(x, y, ch)
-
+=item im_img_16_new(ctx, x, y, ch)
+X<im_img_16_new API>X<i_img_16_new API>

 =category Image creation/destruction
 =category Image creation/destruction

+=synopsis i_img *img = im_img_16_new(aIMCTX, width, height, channels);

 =synopsis i_img *img = i_img_16_new(width, height, channels);
 
 Create a new 16-bit/sample image.
 
 Returns the image on success, or NULL on failure.
 
 =synopsis i_img *img = i_img_16_new(width, height, channels);
 
 Create a new 16-bit/sample image.
 
 Returns the image on success, or NULL on failure.
 

+Also callable as C<i_img_16_new(x, y, ch)>
+

 =cut
 */
 
 =cut
 */
 

-i_img *i_img_16_new(i_img_dim x, i_img_dim y, int ch) {
+i_img *
+im_img_16_new(pIMCTX, i_img_dim x, i_img_dim y, int ch) {

   i_img *im;
   size_t bytes, line_bytes;
 
   i_img *im;
   size_t bytes, line_bytes;
 

-  mm_log((1,"i_img_16_new(x %" i_DF ", y %" i_DF ", ch %d)\n",
+  im_log((aIMCTX, 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_DFc(x), i_DFc(y), ch));
 
   if (x < 1 || y < 1) {

-    i_push_error(0, "Image sizes must be positive");
+    im_push_error(aIMCTX, 0, "Image sizes must be positive");

     return NULL;
   }
   if (ch < 1 || ch > MAXCHANNELS) {
     return NULL;
   }
   if (ch < 1 || ch > MAXCHANNELS) {

-    i_push_errorf(0, "channels must be between 1 and %d", MAXCHANNELS);
+    im_push_errorf(aIMCTX, 0, "channels must be between 1 and %d", MAXCHANNELS);

     return NULL;
   }
   bytes =  x * y * ch * 2;
   if (bytes / y / ch / 2 != x) {
     return NULL;
   }
   bytes =  x * y * ch * 2;
   if (bytes / y / ch / 2 != x) {

-    i_push_errorf(0, "integer overflow calculating image allocation");
+    im_push_errorf(aIMCTX, 0, "integer overflow calculating image allocation");

     return NULL;
   }
   
     return NULL;
   }
   


@@ -181,11 +192,11 @@ i_img *i_img_16_new(i_img_dim x, i_img_dim y, int ch) {
      working with the image */
   line_bytes = sizeof(i_fcolor) * x;
   if (line_bytes / x != sizeof(i_fcolor)) {
      working with the image */
   line_bytes = sizeof(i_fcolor) * x;
   if (line_bytes / x != sizeof(i_fcolor)) {

-    i_push_error(0, "integer overflow calculating scanline allocation");
+    im_push_error(aIMCTX, 0, "integer overflow calculating scanline allocation");

     return NULL;
   }
 
     return NULL;
   }
 

-  im = i_img_alloc();
+  im = im_img_alloc(aIMCTX);

   *im = IIM_base_16bit_direct;
   i_tags_new(&im->tags);
   im->xsize = x;
   *im = IIM_base_16bit_direct;
   i_tags_new(&im->tags);
   im->xsize = x;


@@ -196,7 +207,7 @@ i_img *i_img_16_new(i_img_dim x, i_img_dim y, int ch) {
   im->idata = mymalloc(im->bytes);
   memset(im->idata, 0, im->bytes);
 
   im->idata = mymalloc(im->bytes);
   memset(im->idata, 0, im->bytes);
 

-  i_img_init(im);
+  im_img_init(aIMCTX, im);

 
   return im;
 }
 
   return im;
 }


@@ -218,8 +229,9 @@ i_img_to_rgb16(i_img *im) {
   i_img *targ;
   i_fcolor *line;
   i_img_dim y;
   i_img *targ;
   i_fcolor *line;
   i_img_dim y;

+  dIMCTXim(im);

 
 

-  targ = i_img_16_new(im->xsize, im->ysize, im->channels);
+  targ = im_img_16_new(aIMCTX, im->xsize, im->ysize, im->channels);

   if (!targ)
     return NULL;
   line = mymalloc(sizeof(i_fcolor) * im->xsize);
   if (!targ)
     return NULL;
   line = mymalloc(sizeof(i_fcolor) * im->xsize);


@@ -430,7 +442,8 @@ static i_img_dim i_gsamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i
       /* make sure we have good channel numbers */
       for (ch = 0; ch < chan_count; ++ch) {
         if (chans[ch] < 0 || chans[ch] >= im->channels) {
       /* make sure we have good channel numbers */
       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]);
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);

           return 0;
         }
       }
           return 0;
         }
       }


@@ -444,7 +457,8 @@ static i_img_dim i_gsamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i
     }
     else {
       if (chan_count <= 0 || chan_count > 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", 
+       dIMCTXim(im);
+       im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels", 

                      chan_count);
        return 0;
       }
                      chan_count);
        return 0;
       }


@@ -481,7 +495,8 @@ static i_img_dim i_gsampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
       /* make sure we have good channel numbers */
       for (ch = 0; ch < chan_count; ++ch) {
         if (chans[ch] < 0 || chans[ch] >= im->channels) {
       /* make sure we have good channel numbers */
       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]);
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);

           return 0;
         }
       }
           return 0;
         }
       }


@@ -495,7 +510,8 @@ static i_img_dim i_gsampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
     }
     else {
       if (chan_count <= 0 || chan_count > 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", 
+       dIMCTXim(im);
+       im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels", 

                      chan_count);
        return 0;
       }
                      chan_count);
        return 0;
       }


@@ -537,7 +553,8 @@ i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned *sam
       /* make sure we have good channel numbers */
       for (ch = 0; ch < chan_count; ++ch) {
         if (chans[ch] < 0 || chans[ch] >= im->channels) {
       /* make sure we have good channel numbers */
       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]);
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);

           return -1;
         }
       }
           return -1;
         }
       }


@@ -551,6 +568,7 @@ i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned *sam
     }
     else {
       if (chan_count <= 0 || chan_count > im->channels) {
     }
     else {
       if (chan_count <= 0 || chan_count > im->channels) {

+       dIMCTXim(im);

        i_push_error(0, "Invalid channel count");
        return -1;
       }
        i_push_error(0, "Invalid channel count");
        return -1;
       }


@@ -566,6 +584,7 @@ i_gsamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned *sam
     return count;
   }
   else {
     return count;
   }
   else {

+    dIMCTXim(im);

     i_push_error(0, "Image position outside of image");
     return -1;
   }
     i_push_error(0, "Image position outside of image");
     return -1;
   }


@@ -579,6 +598,7 @@ i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned cons
   i_img_dim off;
 
   if (bits != 16) {
   i_img_dim off;
 
   if (bits != 16) {

+    dIMCTXim(im);

     i_push_error(0, "Invalid bits for 16-bit image");
     return -1;
   }
     i_push_error(0, "Invalid bits for 16-bit image");
     return -1;
   }


@@ -594,7 +614,8 @@ i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned cons
       /* make sure we have good channel numbers */
       for (ch = 0; ch < chan_count; ++ch) {
         if (chans[ch] < 0 || chans[ch] >= im->channels) {
       /* make sure we have good channel numbers */
       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]);
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);

           return -1;
         }
       }
           return -1;
         }
       }


@@ -610,6 +631,7 @@ i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned cons
     }
     else {
       if (chan_count <= 0 || chan_count > im->channels) {
     }
     else {
       if (chan_count <= 0 || chan_count > im->channels) {

+       dIMCTXim(im);

        i_push_error(0, "Invalid channel count");
        return -1;
       }
        i_push_error(0, "Invalid channel count");
        return -1;
       }


@@ -627,6 +649,196 @@ i_psamp_bits_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, unsigned cons
     return count;
   }
   else {
     return count;
   }
   else {

+    dIMCTXim(im);
+    i_push_error(0, "Image position outside of image");
+    return -1;
+  }
+}
+
+/*
+=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) {
+    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) {
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 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) {
+       dIMCTXim(im);
+       im_push_errorf(aIMCTX, 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 {
+    dIMCTXim(im);
+    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) {
+    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) {
+         dIMCTXim(im);
+          im_push_errorf(aIMCTX, 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) {
+       dIMCTXim(im);
+       im_push_errorf(aIMCTX, 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 {
+    dIMCTXim(im);

     i_push_error(0, "Image position outside of image");
     return -1;
   }
     i_push_error(0, "Image position outside of image");
     return -1;
   }