Changeset 2678Tweet

Timestamp:

Aug 8, 2008, 8:07:10 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Handle alpha layer in floodfill (but don't make it conditionnal to the algorithm)

Location:

libpipi/trunk

Files:

• examples/floodfill.c (modified) (1 diff)
• pipi/fill/floodfill.c (modified) (7 diffs)
• pipi/pipi.h (modified) (1 diff)

libpipi/trunk/examples/floodfill.c

@@ -31 +31 @@
     newimg = pipi_copy(img);
     pipi_free(img);
-    ret = pipi_flood_fill(newimg, atoi(argv[2]), atoi(argv[3]), 1, 0, 0);
+    ret = pipi_flood_fill(newimg, atoi(argv[2]), atoi(argv[3]), 1, 0, 0, 1);
 
     if(!ret) pipi_save(newimg, dstname);

libpipi/trunk/pipi/fill/floodfill.c

@@ -36 +36 @@
 static void  pipi_flood_fill_stack_scanline_float(pipi_pixels_t *dstp,
                                                   int x,    int y,
-                                                  float nr, float ng, float nb,
-                                                  float or, float og, float ob);
+                                                  float nr, float ng, float nb, float na,
+                                                  float or, float og, float ob, float oa);
 static int   pop (int *x,int *y, int h);
 static int   push(int x, int y, int h);
@@ -64 +64 @@
 int pipi_flood_fill(pipi_image_t *src,
                     int px, int py,
-                    float r, float g, float b)
+                    float r, float g, float b, float a)
 {
     pipi_image_t  *dst = src;
@@ -81 +81 @@
     if(src->last_modified == PIPI_PIXELS_RGBA32) {
         uint32_t  *dstdata;
-        unsigned char nr, ng, nb;
+        unsigned char nr, ng, nb, na;
 
         /* Get ARGB32 pointer */
@@ -90 +90 @@
         ng = g*255.0f;
         nb = b*255.0f;
+        na = a*255.0f;
 
         dstp->w = w;
         dstp->h = h;
-        pipi_flood_fill_stack_scanline_u32(dstp, px, py, (nr<<16)|(ng<<8)|(nb), dstdata[px+py*w]);
+        pipi_flood_fill_stack_scanline_u32(dstp, px, py, (na<<24)|(nr<<16)|(ng<<8)|(nb), dstdata[px+py*w]);
 
     } else {
         int gray = (dst->last_modified == PIPI_PIXELS_Y_F);
         float *dstdata;
-        float or, og, ob;
+        float or, og, ob, oa;
 
         dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
@@ -108 +109 @@
         og = dstdata[(px+py*w)*4 + 1];
         ob = dstdata[(px+py*w)*4 + 2];
+        oa = dstdata[(px+py*w)*4 + 3];
 
         dstp->w = w;
         dstp->h = h;
 
-        pipi_flood_fill_stack_scanline_float(dstp, px, py, r, g, b, or, og, ob);
+        pipi_flood_fill_stack_scanline_float(dstp, px, py, r, g, b, a, or, og, ob, oa);
     }
 
@@ -178 +180 @@
 static void pipi_flood_fill_stack_scanline_float(pipi_pixels_t *dstp,
                                                  int x,    int y,
-                                                 float nr, float ng, float nb,
-                                                 float or, float og, float ob)
+                                                 float nr, float ng, float nb, float na,
+                                                 float or, float og, float ob, float oa)
 {
     if((nr==or) && (ng==og) && (nb==ob)) return;
@@ -215 +217 @@
             cur_line[x*4 + 1] = ng;
             cur_line[x*4 + 2] = nb;
+            cur_line[x*4 + 3] = na;
 
             if(!left && x > 0 && validate_pixel_f(cur_line[xm1],

libpipi/trunk/pipi/pipi.h

@@ -84 +84 @@
 
 extern int pipi_flood_fill(pipi_image_t *,
-                           int, int, float, float, float);
+                           int, int, float, float, float, float);
 
 extern pipi_image_t *pipi_dither_floydsteinberg(pipi_image_t *, pipi_scan_t);