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

app: fix last fix for the region leak...

Browse Source 
The fix was bogusly destroying a region that is still needed
for the last end_change() if the change count is > 1.
This commit is contained in:
Michael Natterer
2010-10-02 21:52:42 +02:00
parent cad95533dd
commit cfa17dc744
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/display/gimpcanvasitem.c
View File

@ -469,34 +469,36 @@ gimp_canvas_item_end_change (GimpCanvasItem *item)
private->change_count--; private->change_count--;
if (private->change_count == 0 && if (private->change_count == 0)
g_signal_has_handler_pending (item, item_signals[UPDATE], 0, FALSE))
{ {
GdkRegion *region = gimp_canvas_item_get_extents (item); if (g_signal_has_handler_pending (item, item_signals[UPDATE], 0, FALSE))
if (! region)
{ {
region = private->change_region; GdkRegion *region = gimp_canvas_item_get_extents (item);
if (! region)
{
region = private->change_region;
}
else if (private->change_region)
{
gdk_region_union (region, private->change_region);
gdk_region_destroy (private->change_region);
}
private->change_region = NULL;
if (region)
{
g_signal_emit (item, item_signals[UPDATE], 0,
region);
gdk_region_destroy (region);
}
} }
else if (private->change_region) else if (private->change_region)
{ {
gdk_region_union (region, private->change_region);
gdk_region_destroy (private->change_region); gdk_region_destroy (private->change_region);
private->change_region = NULL;
} }
private->change_region = NULL;
if (region)
{
g_signal_emit (item, item_signals[UPDATE], 0,
region);
gdk_region_destroy (region);
}
}
else if (private->change_region)
{
gdk_region_destroy (private->change_region);
private->change_region = NULL;
} }
} }