callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing include and missing call to gimp_drawable_mask_intersect().

Browse Source 
2008-05-21  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpdrawable-process.c (gimp_drawable_process): add
	missing include and missing call to gimp_drawable_mask_intersect().


svn path=/trunk/; revision=25736
This commit is contained in:
Michael Natterer
2008-05-21 18:50:13 +00:00
committed by Michael Natterer
parent 3842f7cb03
commit 3b56173831
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-05-21 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-process.c (gimp_drawable_process): add
missing include and missing call to gimp_drawable_mask_intersect().
2008-05-21 Michael Natterer <mitch@gimp.org>
* app/gegl/gimpdesaturateconfig.c: use a stock_id that exists.
2008-05-21 Martin Nordholts <martinn@svn.gnome.org>
Made the Foreground Select Tool work again.

26
app/core/gimpdrawable-process.c
View File

@ -26,9 +26,11 @@
#include "base/pixel-region.h"
#include "gimpdrawable.h"
#include "gimpdrawable-process.h"
#include "gimpdrawable-shadow.h"
#include "gimpprogress.h"
void
gimp_drawable_process (GimpDrawable *drawable,
GimpProgress *progress,
@ -36,22 +38,26 @@ gimp_drawable_process (GimpDrawable *drawable,
PixelProcessorFunc func,
gpointer data)
{
PixelRegion srcPR, destPR;
gint x, y, width, height;
gint x, y, width, height;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
x, y, width, height, FALSE);
pixel_region_init (&destPR, gimp_drawable_get_shadow_tiles (drawable),
x, y, width, height, TRUE);
if (gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height))
{
PixelRegion srcPR, destPR;
pixel_regions_process_parallel (func, data, 2, &srcPR, &destPR);
pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable),
x, y, width, height, FALSE);
pixel_region_init (&destPR, gimp_drawable_get_shadow_tiles (drawable),
x, y, width, height, TRUE);
gimp_drawable_merge_shadow_tiles (drawable, TRUE, undo_desc);
gimp_drawable_free_shadow_tiles (drawable);
pixel_regions_process_parallel (func, data, 2, &srcPR, &destPR);
gimp_drawable_update (drawable, x, y, width, height);
gimp_drawable_merge_shadow_tiles (drawable, TRUE, undo_desc);
gimp_drawable_free_shadow_tiles (drawable);
gimp_drawable_update (drawable, x, y, width, height);
}
}