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

app: pass the right undo buffer and extents to gimp_drawable_push_undo()

Browse Source 
the coords need to be in drawable bounds now that we got rid of the
weird sparse logic.
This commit is contained in:
Michael Natterer
2012-03-23 03:04:14 +01:00
parent 5bc683f6bc
commit 3bb973f24b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/paint/gimppaintcore.c
View File

@ -457,28 +457,30 @@ gimp_paint_core_finish (GimpPaintCore *core,
if (push_undo) if (push_undo)
{ {
GeglBuffer *buffer; GeglBuffer *buffer;
gint x, y, width, height;
gimp_rectangle_intersect (core->x1, core->y1,
core->x2 - core->x1, core->y2 - core->y1,
0, 0,
gimp_item_get_width (GIMP_ITEM (drawable)),
gimp_item_get_height (GIMP_ITEM (drawable)),
&x, &y, &width, &height);
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT, gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT,
core->undo_desc); core->undo_desc);
GIMP_PAINT_CORE_GET_CLASS (core)->push_undo (core, image, NULL); GIMP_PAINT_CORE_GET_CLASS (core)->push_undo (core, image, NULL);
buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, buffer = gimp_gegl_buffer_new (GIMP_GEGL_RECT (0, 0, width, height),
core->x2 - core->x1,
core->y2 - core->y1),
gimp_drawable_get_format (drawable)); gimp_drawable_get_format (drawable));
gegl_buffer_copy (core->undo_buffer, gegl_buffer_copy (core->undo_buffer,
GIMP_GEGL_RECT (core->x1, core->y1, GIMP_GEGL_RECT (x, y, width, height),
core->x2 - core->x1,
core->y2 - core->y1),
buffer, buffer,
GIMP_GEGL_RECT (0, 0, 0, 0)); GIMP_GEGL_RECT (0, 0, 0, 0));
gimp_drawable_push_undo (drawable, NULL, gimp_drawable_push_undo (drawable, NULL,
buffer, buffer, x, y, width, height);
core->x1, core->y1,
core->x2 - core->x1, core->y2 - core->y1);
g_object_unref (buffer); g_object_unref (buffer);