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

draw only within the intersection of the the passed coordinates and the

Browse Source 
2006-08-14  Michael Natterer  <mitch@gimp.org>

	* libgimp/gimpdrawablepreview.c (gimp_drawable_preview_draw_area):
	draw only within the intersection of the the passed coordinates
	and the selection to avoid access to non-existant (out-of-image)
	selction tiles. Fixes bug #350760.
This commit is contained in:
Michael Natterer
2006-08-14 12:17:34 +00:00
committed by Michael Natterer
parent 740f56c6b9
commit 24d9af3702
2 changed files with 89 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
libgimp/gimpdrawablepreview.c
View File

@ -353,6 +353,36 @@ _gimp_drawable_preview_area_draw_thumb (GimpPreviewArea *area,
}
}
static gboolean
gimp_rectangle_intersect (gint x1,
gint y1,
gint width1,
gint height1,
gint x2,
gint y2,
gint width2,
gint height2,
gint *dest_x,
gint *dest_y,
gint *dest_width,
gint *dest_height)
{
gint d_x, d_y;
gint d_w, d_h;
d_x = MAX (x1, x2);
d_y = MAX (y1, y2);
d_w = MIN (x1 + width1, x2 + width2) - d_x;
d_h = MIN (y1 + height1, y2 + height2) - d_y;
if (dest_x) *dest_x = d_x;
if (dest_y) *dest_y = d_y;
if (dest_width) *dest_width = d_w;
if (dest_height) *dest_height = d_h;
return (d_w > 0 && d_h > 0);
}
static void
gimp_drawable_preview_draw_area (GimpDrawablePreview *preview,
gint x,
@ -380,45 +410,65 @@ gimp_drawable_preview_draw_area (GimpDrawablePreview *preview,
}
else
{
GimpPixelRgn drawable_rgn;
GimpPixelRgn selection_rgn;
guchar *src;
guchar *sel;
gint offset_x;
gint offset_y;
gint selection_id;
selection_id = gimp_image_get_selection (image_id);
gint offset_x, offset_y;
gint mask_x, mask_y;
gint mask_width, mask_height;
gint draw_x, draw_y;
gint draw_width, draw_height;
gimp_drawable_offsets (drawable->drawable_id, &offset_x, &offset_y);
gimp_pixel_rgn_init (&drawable_rgn, drawable,
x, y, width, height,
FALSE, FALSE);
gimp_pixel_rgn_init (&selection_rgn, gimp_drawable_get (selection_id),
x + offset_x, y + offset_y, width, height,
FALSE, FALSE);
if (gimp_drawable_mask_intersect (drawable->drawable_id,
&mask_x, &mask_y,
&mask_width, &mask_height) &&
gimp_rectangle_intersect (mask_x, mask_y,
mask_width, mask_height,
x, y, width, height,
&draw_x, &draw_y,
&draw_width, &draw_height))
{
GimpDrawable *selection;
GimpPixelRgn drawable_rgn;
GimpPixelRgn selection_rgn;
guchar *src;
guchar *sel;
src = g_new (guchar, width * height * drawable->bpp);
sel = g_new (guchar, width * height);
selection = gimp_drawable_get (gimp_image_get_selection (image_id));
gimp_pixel_rgn_get_rect (&drawable_rgn,
src, x, y, width, height);
gimp_pixel_rgn_get_rect (&selection_rgn,
sel, x + offset_x, y + offset_y, width, height);
gimp_pixel_rgn_init (&drawable_rgn, drawable,
draw_x, draw_y, draw_width, draw_height,
FALSE, FALSE);
gimp_pixel_rgn_init (&selection_rgn, selection,
draw_x + offset_x, draw_y + offset_y,
draw_width, draw_height,
FALSE, FALSE);
gimp_preview_area_mask (GIMP_PREVIEW_AREA (gimp_preview->area),
x - gimp_preview->xoff - gimp_preview->xmin,
y - gimp_preview->yoff - gimp_preview->ymin,
width,
height,
gimp_drawable_type (drawable->drawable_id),
src, width * drawable->bpp,
buf, rowstride,
sel, width);
src = g_new (guchar, draw_width * draw_height * drawable->bpp);
sel = g_new (guchar, draw_width * draw_height);
g_free (sel);
g_free (src);
gimp_pixel_rgn_get_rect (&drawable_rgn, src,
draw_x, draw_y,
draw_width, draw_height);
gimp_pixel_rgn_get_rect (&selection_rgn, sel,
draw_x + offset_x, draw_y + offset_y,
draw_width, draw_height);
gimp_preview_area_mask (GIMP_PREVIEW_AREA (gimp_preview->area),
draw_x - gimp_preview->xoff - gimp_preview->xmin,
draw_y - gimp_preview->yoff - gimp_preview->ymin,
draw_width,
draw_height,
gimp_drawable_type (drawable->drawable_id),
src, draw_width * drawable->bpp,
buf + (draw_x - x) + (draw_y - y) * rowstride,
rowstride,
sel, draw_width);
g_free (sel);
g_free (src);
gimp_drawable_detach (selection);
}
}
}