Commit f44a8ea7 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

corrected the size of the pixel region passed to color_region() in case of

2007-11-12  Sven Neumann  <sven@gimp.org>

	* app/core/gimpimage-merge.c (gimp_image_merge_layers): corrected
	the size of the pixel region passed to color_region() in case of
	an indexed image. Fixes bug #495990.

svn path=/trunk/; revision=24136
parent 2500162d
2007-11-12 Sven Neumann <sven@gimp.org>
* app/core/gimpimage-merge.c (gimp_image_merge_layers): corrected
the size of the pixel region passed to color_region() in case of
an indexed image. Fixes bug #495990.
2007-11-12 Michael Natterer <mitch@gimp.org> 2007-11-12 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-callbacks.c
......
...@@ -341,7 +341,7 @@ gimp_image_merge_layers (GimpImage *image, ...@@ -341,7 +341,7 @@ gimp_image_merge_layers (GimpImage *image,
{ {
case GIMP_EXPAND_AS_NECESSARY: case GIMP_EXPAND_AS_NECESSARY:
case GIMP_CLIP_TO_IMAGE: case GIMP_CLIP_TO_IMAGE:
if (!count) if (! count)
{ {
x1 = off_x; x1 = off_x;
y1 = off_y; y1 = off_y;
...@@ -359,6 +359,7 @@ gimp_image_merge_layers (GimpImage *image, ...@@ -359,6 +359,7 @@ gimp_image_merge_layers (GimpImage *image,
if ((off_y + gimp_item_height (GIMP_ITEM (layer))) > y2) if ((off_y + gimp_item_height (GIMP_ITEM (layer))) > y2)
y2 = (off_y + gimp_item_height (GIMP_ITEM (layer))); y2 = (off_y + gimp_item_height (GIMP_ITEM (layer)));
} }
if (merge_type == GIMP_CLIP_TO_IMAGE) if (merge_type == GIMP_CLIP_TO_IMAGE)
{ {
x1 = CLAMP (x1, 0, image->width); x1 = CLAMP (x1, 0, image->width);
...@@ -413,7 +414,7 @@ gimp_image_merge_layers (GimpImage *image, ...@@ -413,7 +414,7 @@ gimp_image_merge_layers (GimpImage *image,
type, type,
gimp_object_get_name (GIMP_OBJECT (layer)), gimp_object_get_name (GIMP_OBJECT (layer)),
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE); GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
if (!merge_layer) if (! merge_layer)
{ {
g_warning ("%s: could not allocate merge layer.", G_STRFUNC); g_warning ("%s: could not allocate merge layer.", G_STRFUNC);
return NULL; return NULL;
...@@ -430,8 +431,7 @@ gimp_image_merge_layers (GimpImage *image, ...@@ -430,8 +431,7 @@ gimp_image_merge_layers (GimpImage *image,
/* init the pixel region */ /* init the pixel region */
pixel_region_init (&src1PR, pixel_region_init (&src1PR,
gimp_drawable_get_tiles (GIMP_DRAWABLE (merge_layer)), gimp_drawable_get_tiles (GIMP_DRAWABLE (merge_layer)),
0, 0, 0, 0, (x2 - x1), (y2 - y1),
image->width, image->height,
TRUE); TRUE);
/* set the region to the background color */ /* set the region to the background color */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment