[gimp/goat-invasion: 145/526] app: remove color_region_mask()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/goat-invasion: 145/526] app: remove color_region_mask()
- Date: Sun, 22 Apr 2012 13:11:27 +0000 (UTC)
commit 3b0dec195966910ec7099ffab1645ff2f3f6f60f
Author: Michael Natterer <mitch gimp org>
Date: Mon Mar 19 02:40:14 2012 +0100
app: remove color_region_mask()
app/paint-funcs/paint-funcs-generic.h | 54 ---------------------------------
app/paint-funcs/paint-funcs.c | 37 ----------------------
app/paint-funcs/paint-funcs.h | 9 -----
3 files changed, 0 insertions(+), 100 deletions(-)
---
diff --git a/app/paint-funcs/paint-funcs-generic.h b/app/paint-funcs/paint-funcs-generic.h
index 8685a26..8240203 100644
--- a/app/paint-funcs/paint-funcs-generic.h
+++ b/app/paint-funcs/paint-funcs-generic.h
@@ -119,60 +119,6 @@ color_pixels (guchar *dest,
}
}
-void
-color_pixels_mask (guchar *dest,
- const guchar *mask,
- const guchar *color,
- guint w,
- guint bytes)
-{
- guchar c0, c1, c2;
-
- switch (bytes)
- {
- case 1:
- memset (dest, *color, w);
- break;
-
- case 2:
- c0 = color[0];
- while (w--)
- {
- dest[0] = c0;
- dest[1] = *mask++;
- dest += 2;
- }
- break;
-
- case 3:
- c0 = color[0];
- c1 = color[1];
- c2 = color[2];
- while (w--)
- {
- dest[0] = c0;
- dest[1] = c1;
- dest[2] = c2;
- dest += 3;
- }
- break;
-
- case 4:
- c0 = color[0];
- c1 = color[1];
- c2 = color[2];
- while (w--)
- {
- dest[0] = c0;
- dest[1] = c1;
- dest[2] = c2;
- dest[3] = *mask++;
- dest += 4;
- }
- break;
- }
-}
-
/*
* blend_pixels patched 8-24-05 to fix bug #163721. Note that this change
* causes the function to treat src1 and src2 asymmetrically. This gives the
diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c
index 1bbcb99..a67562b 100644
--- a/app/paint-funcs/paint-funcs.c
+++ b/app/paint-funcs/paint-funcs.c
@@ -1768,43 +1768,6 @@ color_region (PixelRegion *dest,
}
void
-color_region_mask (PixelRegion *dest,
- PixelRegion *mask,
- const guchar *col)
-{
- gpointer pr;
-
- for (pr = pixel_regions_register (2, dest, mask);
- pr != NULL;
- pr = pixel_regions_process (pr))
- {
- guchar *d = dest->data;
- const guchar *m = mask->data;
- gint h = dest->h;
-
- if (dest->w * dest->bytes == dest->rowstride &&
- mask->w * mask->bytes == mask->rowstride)
- {
- /* do it all in one function call if we can
- * this hasn't been tested to see if it is a
- * signifigant speed gain yet
- */
- color_pixels_mask (d, m, col, dest->w * h, dest->bytes);
- }
- else
- {
- while (h--)
- {
- color_pixels_mask (d, m, col, dest->w, dest->bytes);
-
- d += dest->rowstride;
- m += mask->rowstride;
- }
- }
- }
-}
-
-void
blend_region (PixelRegion *src1,
PixelRegion *src2,
PixelRegion *dest,
diff --git a/app/paint-funcs/paint-funcs.h b/app/paint-funcs/paint-funcs.h
index 4158987..3d81cfb 100644
--- a/app/paint-funcs/paint-funcs.h
+++ b/app/paint-funcs/paint-funcs.h
@@ -26,12 +26,6 @@ void color_pixels (guchar *dest,
guint w,
guint bytes);
-void color_pixels_mask (guchar *dest,
- const guchar *mask,
- const guchar *color,
- guint w,
- guint bytes);
-
void blend_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
@@ -315,9 +309,6 @@ void extract_from_indexed_pixels (guchar *src,
void color_region (PixelRegion *dest,
const guchar *color);
-void color_region_mask (PixelRegion *dest,
- PixelRegion *mask,
- const guchar *color);
void blend_region (PixelRegion *src1,
PixelRegion *src2,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]