From afaa010bb67b5099d41b4552a226173156d5adce Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 17 Jun 2005 16:26:06 +0000 Subject: [PATCH] pass GimpImageBaseType to extract_from_region() instead of some anonymous 2005-06-17 Sven Neumann * app/paint-funcs/paint-funcs.[ch]: pass GimpImageBaseType to extract_from_region() instead of some anonymous integer. Added some const qualifiers. --- ChangeLog | 6 ++++++ app/paint-funcs/paint-funcs.c | 25 +++++++++++++------------ app/paint-funcs/paint-funcs.h | 16 ++++++++-------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f84998e02..fb4cf02a96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-17 Sven Neumann + + * app/paint-funcs/paint-funcs.[ch]: pass GimpImageBaseType to + extract_from_region() instead of some anonymous integer. Added + some const qualifiers. + 2005-06-17 Sven Neumann * app/core/gimpselection.c (gimp_selection_extract): fixed diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c index dd56d9f9b4..a9326eb394 100644 --- a/app/paint-funcs/paint-funcs.c +++ b/app/paint-funcs/paint-funcs.c @@ -2345,14 +2345,14 @@ extract_alpha_region (PixelRegion *src, void -extract_from_region (PixelRegion *src, - PixelRegion *dest, - PixelRegion *mask, - guchar *cmap, - guchar *bg, - gint type, - gboolean has_alpha, - gboolean cut) +extract_from_region (PixelRegion *src, + PixelRegion *dest, + PixelRegion *mask, + const guchar *cmap, + const guchar *bg, + GimpImageBaseType type, + gboolean has_alpha, + gboolean cut) { gint h; guchar *s, *d, *m; @@ -2371,12 +2371,13 @@ extract_from_region (PixelRegion *src, { switch (type) { - case 0: /* RGB */ - case 1: /* GRAY */ + case GIMP_RGB: + case GIMP_GRAY: extract_from_inten_pixels (s, d, m, bg, cut, src->w, src->bytes, has_alpha); break; - case 2: /* INDEXED */ + + case GIMP_INDEXED: extract_from_indexed_pixels (s, d, m, cmap, bg, cut, src->w, src->bytes, has_alpha); break; @@ -3799,7 +3800,7 @@ struct initial_regions_struct guint opacity; GimpLayerModeEffects mode; const gboolean *affect; - InitialMode type; + InitialMode type; guchar *data; }; diff --git a/app/paint-funcs/paint-funcs.h b/app/paint-funcs/paint-funcs.h index 81f5ef52eb..2e0e0e1cd5 100644 --- a/app/paint-funcs/paint-funcs.h +++ b/app/paint-funcs/paint-funcs.h @@ -339,14 +339,14 @@ void extract_alpha_region (PixelRegion *src, PixelRegion *mask, PixelRegion *dest); -void extract_from_region (PixelRegion *src, - PixelRegion *dest, - PixelRegion *mask, - guchar *cmap, - guchar *bg, - gint type, - gboolean has_alpha, - gboolean cut); +void extract_from_region (PixelRegion *src, + PixelRegion *dest, + PixelRegion *mask, + const guchar *cmap, + const guchar *bg, + GimpImageBaseType type, + gboolean has_alpha, + gboolean cut); void convolve_region (PixelRegion *srcR,