minor updates, make it clear in the title this documents the C level.

[imager.git] / fills.c

diff --git a/fills.c b/fills.c
index 196d91ca616c874d013598a884ed8ff68282d4f0..05db1aabd5a0cccadbf7d5d807a5a08e5a93d2c5 100644 (file)
--- a/fills.c
+++ b/fills.c
@@ -1,5 +1,5 @@
-#include "image.h"
-#include "imagei.h"
+#include "imager.h"
+#include "imageri.h"

 
 /*
 =head1 NAME
 
 /*
 =head1 NAME


@@ -104,7 +104,7 @@ regmach - use the register machine to generate colors
 =cut
 */
 
 =cut
 */
 

-static i_color fcolor_to_color(i_fcolor *c) {
+static i_color fcolor_to_color(const i_fcolor *c) {

   int ch;
   i_color out;
 
   int ch;
   i_color out;
 


@@ -114,7 +114,7 @@ static i_color fcolor_to_color(i_fcolor *c) {
   return out;
 }
 
   return out;
 }
 

-static i_fcolor color_to_fcolor(i_color *c) {
+static i_fcolor color_to_fcolor(const i_color *c) {

   int ch;
   i_fcolor out;
 
   int ch;
   i_fcolor out;
 


@@ -163,13 +163,13 @@ typedef struct
 } i_fill_solid_t;
 
 static void fill_solid(i_fill_t *, int x, int y, int width, int channels, 
 } i_fill_solid_t;
 
 static void fill_solid(i_fill_t *, int x, int y, int width, int channels, 

-                       i_color *, i_color *);
+                       i_color *);

 static void fill_solidf(i_fill_t *, int x, int y, int width, int channels, 
 static void fill_solidf(i_fill_t *, int x, int y, int width, int channels, 

-                        i_fcolor *, i_fcolor *);
+                        i_fcolor *);

 static void fill_solid_comb(i_fill_t *, int x, int y, int width, int channels, 
 static void fill_solid_comb(i_fill_t *, int x, int y, int width, int channels, 

-                            i_color *, i_color *);
+                            i_color *);

 static void fill_solidf_comb(i_fill_t *, int x, int y, int width, 
 static void fill_solidf_comb(i_fill_t *, int x, int y, int width, 

-                             int channels, i_fcolor *, i_fcolor *);
+                             int channels, i_fcolor *);

 
 static i_fill_solid_t base_solid_fill =
 {
 
 static i_fill_solid_t base_solid_fill =
 {


@@ -195,6 +195,8 @@ static i_fill_solid_t base_solid_fill_comb =
 /*
 =item i_fill_destroy(fill)
 
 /*
 =item i_fill_destroy(fill)
 

+=category Fills
+

 Call to destroy any fill object.
 
 =cut
 Call to destroy any fill object.
 
 =cut


@@ -210,6 +212,8 @@ i_fill_destroy(i_fill_t *fill) {
 /*
 =item i_new_fill_solidf(color, combine)
 
 /*
 =item i_new_fill_solidf(color, combine)
 

+=category Fills
+

 Create a solid fill based on a float color.
 
 If combine is non-zero then alpha values will be combined.
 Create a solid fill based on a float color.
 
 If combine is non-zero then alpha values will be combined.


@@ -218,9 +222,9 @@ If combine is non-zero then alpha values will be combined.
 */
 
 i_fill_t *
 */
 
 i_fill_t *

-i_new_fill_solidf(i_fcolor *c, int combine) {
+i_new_fill_solidf(const i_fcolor *c, int combine) {

   int ch;
   int ch;

-  i_fill_solid_t *fill = mymalloc(sizeof(i_fill_solid_t));
+  i_fill_solid_t *fill = mymalloc(sizeof(i_fill_solid_t)); /* checked 14jul05 tonyc */

   
   if (combine) {
     *fill = base_solid_fill_comb;
   
   if (combine) {
     *fill = base_solid_fill_comb;


@@ -239,7 +243,9 @@ i_new_fill_solidf(i_fcolor *c, int combine) {
 /*
 =item i_new_fill_solid(color, combine)
 
 /*
 =item i_new_fill_solid(color, combine)
 

-Create a solid fill based.
+=category Fills
+
+Create a solid fill based on an 8-bit color.

 
 If combine is non-zero then alpha values will be combined.
 
 
 If combine is non-zero then alpha values will be combined.
 


@@ -247,9 +253,9 @@ If combine is non-zero then alpha values will be combined.
 */
 
 i_fill_t *
 */
 
 i_fill_t *

-i_new_fill_solid(i_color *c, int combine) {
+i_new_fill_solid(const i_color *c, int combine) {

   int ch;
   int ch;

-  i_fill_solid_t *fill = mymalloc(sizeof(i_fill_solid_t));
+  i_fill_solid_t *fill = mymalloc(sizeof(i_fill_solid_t)); /* checked 14jul05 tonyc */

 
   if (combine) {
     *fill = base_solid_fill_comb;
 
   if (combine) {
     *fill = base_solid_fill_comb;


@@ -408,18 +414,20 @@ typedef struct
 } i_fill_hatch_t;
 
 static void fill_hatch(i_fill_t *fill, int x, int y, int width, int channels, 
 } i_fill_hatch_t;
 
 static void fill_hatch(i_fill_t *fill, int x, int y, int width, int channels, 

-                       i_color *data, i_color *work);
+                       i_color *data);

 static void fill_hatchf(i_fill_t *fill, int x, int y, int width, int channels, 
 static void fill_hatchf(i_fill_t *fill, int x, int y, int width, int channels, 

-                        i_fcolor *data, i_fcolor *work);
+                        i_fcolor *data);

 static
 i_fill_t *
 static
 i_fill_t *

-i_new_hatch_low(i_color *fg, i_color *bg, i_fcolor *ffg, i_fcolor *fbg, 
-                int combine, int hatch, unsigned char *cust_hatch,
+i_new_hatch_low(const i_color *fg, const i_color *bg, const i_fcolor *ffg, const i_fcolor *fbg, 
+                int combine, int hatch, const unsigned char *cust_hatch,

                 int dx, int dy);
 
 /*
 =item i_new_fill_hatch(fg, bg, combine, hatch, cust_hatch, dx, dy)
 
                 int dx, int dy);
 
 /*
 =item i_new_fill_hatch(fg, bg, combine, hatch, cust_hatch, dx, dy)
 

+=category Fills
+

 Creates a new hatched fill with the fg color used for the 1 bits in
 the hatch and bg for the 0 bits.  If combine is non-zero alpha values
 will be combined.
 Creates a new hatched fill with the fg color used for the 1 bits in
 the hatch and bg for the 0 bits.  If combine is non-zero alpha values
 will be combined.


@@ -434,8 +442,8 @@ If cust_hatch is NULL then one of the standard hatches is used.
 =cut
 */
 i_fill_t *
 =cut
 */
 i_fill_t *

-i_new_fill_hatch(i_color *fg, i_color *bg, int combine, int hatch, 
-            unsigned char *cust_hatch, int dx, int dy) {
+i_new_fill_hatch(const i_color *fg, const i_color *bg, int combine, int hatch, 
+            const unsigned char *cust_hatch, int dx, int dy) {

   return i_new_hatch_low(fg, bg, NULL, NULL, combine, hatch, cust_hatch, 
                          dx, dy);
 }
   return i_new_hatch_low(fg, bg, NULL, NULL, combine, hatch, cust_hatch, 
                          dx, dy);
 }


@@ -443,6 +451,8 @@ i_new_fill_hatch(i_color *fg, i_color *bg, int combine, int hatch,
 /*
 =item i_new_fill_hatchf(fg, bg, combine, hatch, cust_hatch, dx, dy)
 
 /*
 =item i_new_fill_hatchf(fg, bg, combine, hatch, cust_hatch, dx, dy)
 

+=category Fills
+

 Creates a new hatched fill with the fg color used for the 1 bits in
 the hatch and bg for the 0 bits.  If combine is non-zero alpha values
 will be combined.
 Creates a new hatched fill with the fg color used for the 1 bits in
 the hatch and bg for the 0 bits.  If combine is non-zero alpha values
 will be combined.


@@ -457,16 +467,16 @@ If cust_hatch is NULL then one of the standard hatches is used.
 =cut
 */
 i_fill_t *
 =cut
 */
 i_fill_t *

-i_new_fill_hatchf(i_fcolor *fg, i_fcolor *bg, int combine, int hatch, 
-            unsigned char *cust_hatch, int dx, int dy) {
+i_new_fill_hatchf(const i_fcolor *fg, const i_fcolor *bg, int combine, int hatch, 
+                 const unsigned char *cust_hatch, int dx, int dy) {

   return i_new_hatch_low(NULL, NULL, fg, bg, combine, hatch, cust_hatch, 
                          dx, dy);
 }
 
 static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,
   return i_new_hatch_low(NULL, NULL, fg, bg, combine, hatch, cust_hatch, 
                          dx, dy);
 }
 
 static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,

-                       i_color *data, i_color *work);
+                       i_color *data);

 static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,
 static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,

-                       i_fcolor *data, i_fcolor *work);
+                       i_fcolor *data);

 struct i_fill_image_t {
   i_fill_t base;
   i_img *src;
 struct i_fill_image_t {
   i_fill_t base;
   i_img *src;


@@ -478,13 +488,19 @@ struct i_fill_image_t {
 /*
 =item i_new_fill_image(im, matrix, xoff, yoff, combine)
 
 /*
 =item i_new_fill_image(im, matrix, xoff, yoff, combine)
 

+=category Fills
+

 Create an image based fill.
 
 Create an image based fill.
 

+matrix is an array of 9 doubles representing a transformation matrix.
+
+xoff and yoff are the offset into the image to start filling from.
+

 =cut
 */
 i_fill_t *
 =cut
 */
 i_fill_t *

-i_new_fill_image(i_img *im, double *matrix, int xoff, int yoff, int combine) {
-  struct i_fill_image_t *fill = mymalloc(sizeof(*fill));
+i_new_fill_image(i_img *im, const double *matrix, int xoff, int yoff, int combine) {
+  struct i_fill_image_t *fill = mymalloc(sizeof(*fill)); /* checked 14jul05 tonyc */

 
   fill->base.fill_with_color = fill_image;
   fill->base.fill_with_fcolor = fill_imagef;
 
   fill->base.fill_with_color = fill_image;
   fill->base.fill_with_fcolor = fill_imagef;


@@ -532,7 +548,7 @@ The 8-bit sample fill function for non-combining solid fills.
 */
 static void
 fill_solid(i_fill_t *fill, int x, int y, int width, int channels, 
 */
 static void
 fill_solid(i_fill_t *fill, int x, int y, int width, int channels, 

-           i_color *data, i_color *work) {
+           i_color *data) {

   while (width-- > 0) {
     *data++ = T_SOLID_FILL(fill)->c;
   }
   while (width-- > 0) {
     *data++ = T_SOLID_FILL(fill)->c;
   }


@@ -547,7 +563,7 @@ The floating sample fill function for non-combining solid fills.
 */
 static void
 fill_solidf(i_fill_t *fill, int x, int y, int width, int channels, 
 */
 static void
 fill_solidf(i_fill_t *fill, int x, int y, int width, int channels, 

-           i_fcolor *data, i_fcolor *work) {
+           i_fcolor *data) {

   while (width-- > 0) {
     *data++ = T_SOLID_FILL(fill)->fc;
   }
   while (width-- > 0) {
     *data++ = T_SOLID_FILL(fill)->fc;
   }


@@ -562,15 +578,12 @@ The 8-bit sample fill function for combining solid fills.
 */
 static void
 fill_solid_comb(i_fill_t *fill, int x, int y, int width, int channels, 
 */
 static void
 fill_solid_comb(i_fill_t *fill, int x, int y, int width, int channels, 

-                i_color *data, i_color *work) {
+                i_color *data) {

   i_color c = T_SOLID_FILL(fill)->c;
   i_color c = T_SOLID_FILL(fill)->c;

-  int count = width;
-  i_color *wstart = work;

 
   while (width-- > 0) {
 
   while (width-- > 0) {

-    *work++ = c;
+    *data++ = c;

   }
   }

-  (fill->combine)(data, wstart, channels, count);

 }
 
 /*
 }
 
 /*


@@ -582,15 +595,12 @@ The floating sample fill function for combining solid fills.
 */
 static void
 fill_solidf_comb(i_fill_t *fill, int x, int y, int width, int channels, 
 */
 static void
 fill_solidf_comb(i_fill_t *fill, int x, int y, int width, int channels, 

-           i_fcolor *data, i_fcolor *work) {
+           i_fcolor *data) {

   i_fcolor c = T_SOLID_FILL(fill)->fc;
   i_fcolor c = T_SOLID_FILL(fill)->fc;

-  int count = width;
-  i_fcolor *wstart = work;

 
   while (width-- > 0) {
 
   while (width-- > 0) {

-    *work++ = c;
+    *data++ = c;

   }
   }

-  (fill->combinef)(data, wstart, channels, count);

 }
 
 /*
 }
 
 /*


@@ -602,10 +612,11 @@ Implements creation of hatch fill objects.
 */
 static
 i_fill_t *
 */
 static
 i_fill_t *

-i_new_hatch_low(i_color *fg, i_color *bg, i_fcolor *ffg, i_fcolor *fbg, 
-                int combine, int hatch, unsigned char *cust_hatch,
+i_new_hatch_low(const i_color *fg, const i_color *bg, 
+               const i_fcolor *ffg, const i_fcolor *fbg, 
+                int combine, int hatch, const unsigned char *cust_hatch,

                 int dx, int dy) {
                 int dx, int dy) {

-  i_fill_hatch_t *fill = mymalloc(sizeof(i_fill_hatch_t));
+  i_fill_hatch_t *fill = mymalloc(sizeof(i_fill_hatch_t)); /* checked 14jul05 tonyc */

 
   fill->base.fill_with_color = fill_hatch;
   fill->base.fill_with_fcolor = fill_hatchf;
 
   fill->base.fill_with_color = fill_hatch;
   fill->base.fill_with_fcolor = fill_hatchf;


@@ -640,34 +651,20 @@ i_new_hatch_low(i_color *fg, i_color *bg, i_fcolor *ffg, i_fcolor *fbg,
 
 The 8-bit sample fill function for hatched fills.
 
 
 The 8-bit sample fill function for hatched fills.
 

-=back
+=cut

 */
 static void fill_hatch(i_fill_t *fill, int x, int y, int width, int channels, 
 */
 static void fill_hatch(i_fill_t *fill, int x, int y, int width, int channels, 

-                       i_color *data, i_color *work) {
+                       i_color *data) {

   i_fill_hatch_t *f = (i_fill_hatch_t *)fill;
   int byte = f->hatch[(y + f->dy) & 7];
   int xpos = (x + f->dx) & 7;
   int mask = 128 >> xpos;
 
   i_fill_hatch_t *f = (i_fill_hatch_t *)fill;
   int byte = f->hatch[(y + f->dy) & 7];
   int xpos = (x + f->dx) & 7;
   int mask = 128 >> xpos;
 

-  if (fill->combine) {
-    int count = width;
-    i_color *wstart = work;
-
-    while (count-- > 0) {
-      *work++ = (byte & mask) ? f->fg : f->bg;
-      
-      if ((mask >>= 1) == 0)
-        mask = 128;
-    }
-    (fill->combine)(data, wstart, channels, width);
-  }
-  else {
-    while (width-- > 0) {
-      *data++ = (byte & mask) ? f->fg : f->bg;
-
-      if ((mask >>= 1) == 0)
-        mask = 128;
-    }
+  while (width-- > 0) {
+    *data++ = (byte & mask) ? f->fg : f->bg;
+    
+    if ((mask >>= 1) == 0)
+      mask = 128;

   }
 }
 
   }
 }
 


@@ -679,31 +676,17 @@ The floating sample fill function for hatched fills.
 =back
 */
 static void fill_hatchf(i_fill_t *fill, int x, int y, int width, int channels, 
 =back
 */
 static void fill_hatchf(i_fill_t *fill, int x, int y, int width, int channels, 

-                        i_fcolor *data, i_fcolor *work) {
+                        i_fcolor *data) {

   i_fill_hatch_t *f = (i_fill_hatch_t *)fill;
   int byte = f->hatch[(y + f->dy) & 7];
   int xpos = (x + f->dx) & 7;
   int mask = 128 >> xpos;
   
   i_fill_hatch_t *f = (i_fill_hatch_t *)fill;
   int byte = f->hatch[(y + f->dy) & 7];
   int xpos = (x + f->dx) & 7;
   int mask = 128 >> xpos;
   

-  if (fill->combinef) {
-    int count = width;
-    i_fcolor *wstart = work;
-
-    while (count-- > 0) {
-      *work++ = (byte & mask) ? f->ffg : f->fbg;
-      
-      if ((mask >>= 1) == 0)
-        mask = 128;
-    }
-    (fill->combinef)(data, wstart, channels, width);
-  }
-  else {
-    while (width-- > 0) {
-      *data++ = (byte & mask) ? f->ffg : f->fbg;
-
-      if ((mask >>= 1) == 0)
-        mask = 128;
-    }
+  while (width-- > 0) {
+    *data++ = (byte & mask) ? f->ffg : f->fbg;
+    
+    if ((mask >>= 1) == 0)
+      mask = 128;

   }
 }
 
   }
 }
 


@@ -757,11 +740,10 @@ static i_fcolor interp_i_fcolor(i_fcolor before, i_fcolor after, double pos,
 =cut
 */
 static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,
 =cut
 */
 static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,

-                       i_color *data, i_color *work) {
+                       i_color *data) {

   struct i_fill_image_t *f = (struct i_fill_image_t *)fill;
   struct i_fill_image_t *f = (struct i_fill_image_t *)fill;

-  i_color *out = fill->combine ? work : data;

   int i = 0;
   int i = 0;

-  i_color c;
+  i_color *out = data;

   
   if (f->has_matrix) {
     /* the hard way */
   
   if (f->has_matrix) {
     /* the hard way */


@@ -824,9 +806,28 @@ static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,
       ++i;
     }
   }
       ++i;
     }
   }

-
-  if (fill->combine) {
-    (fill->combine)(data, work, channels, width);
+  if (f->src->channels == 3) {
+    /* just set the alpha */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = 255;
+      data++;
+    }
+  }
+  else if (f->src->channels == 2) {
+    /* copy the alpha to channel 3, duplicate the grey value */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = data->channel[1];
+      data->channel[1] = data->channel[2] = data->channel[0];
+      data++;
+    }
+  }
+  else if (f->src->channels == 1) {
+    /* set the alpha, duplicate grey */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = 255;
+      data->channel[1] = data->channel[2] = data->channel[0];
+      data++;
+    }

   }
 }
 
   }
 }
 


@@ -836,11 +837,9 @@ static void fill_image(i_fill_t *fill, int x, int y, int width, int channels,
 =cut
 */
 static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,
 =cut
 */
 static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,

-                       i_fcolor *data, i_fcolor *work) {
+                       i_fcolor *data) {

   struct i_fill_image_t *f = (struct i_fill_image_t *)fill;
   struct i_fill_image_t *f = (struct i_fill_image_t *)fill;

-  i_fcolor *out = fill->combine ? work : data;

   int i = 0;
   int i = 0;

-  i_fcolor c;

   
   if (f->has_matrix) {
     /* the hard way */
   
   if (f->has_matrix) {
     /* the hard way */


@@ -875,7 +874,7 @@ static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,
         }
         c2[dy] = interp_i_fcolor(c[dy][0], c[dy][1], rx, f->src->channels);
       }
         }
         c2[dy] = interp_i_fcolor(c[dy][0], c[dy][1], rx, f->src->channels);
       }

-      *out++ = interp_i_fcolor(c2[0], c2[1], ry, f->src->channels);
+      *data++ = interp_i_fcolor(c2[0], c2[1], ry, f->src->channels);

       ++i;
     }
   }
       ++i;
     }
   }


@@ -898,14 +897,33 @@ static void fill_imagef(i_fill_t *fill, int x, int y, int width, int channels,
       }
       rx -= ix * f->src->xsize;
       ry -= iy * f->src->ysize;
       }
       rx -= ix * f->src->xsize;
       ry -= iy * f->src->ysize;

-      i_gpixf(f->src, rx, ry, out);
-      ++out;
+      i_gpixf(f->src, rx, ry, data);
+      ++data;

       ++i;
     }
   }
       ++i;
     }
   }

-
-  if (fill->combinef) {
-    (fill->combinef)(data, work, channels, width);
+  if (f->src->channels == 3) {
+    /* just set the alpha */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = 1.0;
+      data++;
+    }
+  }
+  else if (f->src->channels == 2) {
+    /* copy the alpha to channel 3, duplicate the grey value */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = data->channel[1];
+      data->channel[1] = data->channel[2] = data->channel[0];
+      data++;
+    }
+  }
+  else if (f->src->channels == 1) {
+    /* set the alpha, duplicate grey */
+    for (i = 0; i <  width; ++i) {
+      data->channel[3] = 1.0;
+      data->channel[1] = data->channel[2] = data->channel[0];
+      data++;
+    }

   }
 }
 
   }
 }
 


@@ -936,7 +954,7 @@ static void combine_valuef(i_fcolor *, i_fcolor *, int, int);
 static void combine_color(i_color *, i_color *, int, int);
 static void combine_colorf(i_fcolor *, i_fcolor *, int, int);
 
 static void combine_color(i_color *, i_color *, int, int);
 static void combine_colorf(i_fcolor *, i_fcolor *, int, int);
 

-struct i_combines {
+static struct i_combines {

   i_fill_combine_f combine;
   i_fill_combinef_f combinef;
 } combines[] =
   i_fill_combine_f combine;
   i_fill_combinef_f combinef;
 } combines[] =


@@ -1047,7 +1065,6 @@ static void combine_mult(i_color *out, i_color *in, int channels, int count) {
   int ch;
 
   while (count--) {
   int ch;
 
   while (count--) {

-    i_color c = *in;

     double mult[MAXCHANNELS];
     mult[3] = in->channel[3];
     for (ch = 0; ch < (channels); ++ch) { 
     double mult[MAXCHANNELS];
     mult[3] = in->channel[3];
     for (ch = 0; ch < (channels); ++ch) { 


@@ -1076,8 +1093,6 @@ static void combine_multf(i_fcolor *out, i_fcolor *in, int channels, int count)
 }
 
 static void combine_dissolve(i_color *out, i_color *in, int channels, int count) {
 }
 
 static void combine_dissolve(i_color *out, i_color *in, int channels, int count) {

-  int ch;
-

   while (count--) {
     if (in->channel[3] > rand() * (255.0 / RAND_MAX))
       COMBINE(*out, *in, channels);
   while (count--) {
     if (in->channel[3] > rand() * (255.0 / RAND_MAX))
       COMBINE(*out, *in, channels);


@@ -1087,8 +1102,6 @@ static void combine_dissolve(i_color *out, i_color *in, int channels, int count)
 }
 
 static void combine_dissolvef(i_fcolor *out, i_fcolor *in, int channels, int count) {
 }
 
 static void combine_dissolvef(i_fcolor *out, i_fcolor *in, int channels, int count) {

-  int ch;
-

   while (count--) {
     if (in->channel[3] > rand() * (1.0 / RAND_MAX))
       COMBINEF(*out, *in, channels);
   while (count--) {
     if (in->channel[3] > rand() * (1.0 / RAND_MAX))
       COMBINEF(*out, *in, channels);