dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: don't preserve() GimpImageMapTool around most GimpImageMap calls

Browse source 
It's useles ever since we ported GimpImageMap to GEGL.
This commit is contained in:
Michael Natterer 2016-05-09 21:48:16 +02:00
parent 477987dce3
commit 68936e4cc2
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/tools/gimpimagemaptool.c
View file

@ -701,23 +701,15 @@ gimp_image_map_tool_options_notify (GimpTool *tool,
{
if (im_options->preview)
{
gimp_tool_control_push_preserve (tool->control, TRUE);
gimp_image_map_apply (im_tool->image_map, NULL);
gimp_tool_control_pop_preserve (tool->control);
if (im_options->preview_split)
gimp_image_map_tool_add_guide (im_tool);
}
else
{
gimp_tool_control_push_preserve (tool->control, TRUE);
gimp_image_map_abort (im_tool->image_map);
gimp_tool_control_pop_preserve (tool->control);
if (im_options->preview_split)
gimp_image_map_tool_remove_guide (im_tool);
}
@ -878,14 +870,10 @@ gimp_image_map_tool_halt (GimpImageMapTool *im_tool)
if (im_tool->image_map)
{
gimp_tool_control_push_preserve (tool->control, TRUE);
gimp_image_map_abort (im_tool->image_map);
g_object_unref (im_tool->image_map);
im_tool->image_map = NULL;
gimp_tool_control_pop_preserve (tool->control);
gimp_image_map_tool_remove_guide (im_tool);
}
@ -904,11 +892,11 @@ gimp_image_map_tool_commit (GimpImageMapTool *im_tool)
{
GimpImageMapOptions *options = GIMP_IMAGE_MAP_TOOL_GET_OPTIONS (tool);
gimp_tool_control_push_preserve (tool->control, TRUE);
if (! options->preview)
gimp_image_map_apply (im_tool->image_map, NULL);
gimp_tool_control_push_preserve (tool->control, TRUE);
gimp_image_map_commit (im_tool->image_map, GIMP_PROGRESS (tool), TRUE);
g_object_unref (im_tool->image_map);
im_tool->image_map = NULL;
@ -998,11 +986,7 @@ gimp_image_map_tool_preview (GimpImageMapTool *im_tool)
if (im_tool->image_map && options->preview)
{
gimp_tool_control_push_preserve (tool->control, TRUE);
gimp_image_map_apply (im_tool->image_map, NULL);
gimp_tool_control_pop_preserve (tool->control);
}
}