[gimp] app: don't try to draw a NULL boundary in gimp_region_select_tool_draw()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: don't try to draw a NULL boundary in gimp_region_select_tool_draw()
- Date: Wed, 27 Aug 2014 19:13:54 +0000 (UTC)
commit f38d3a16729e0ca8e42edb9cb63565521afa53bf
Author: Michael Natterer <mitch gimp org>
Date: Wed Aug 27 21:10:55 2014 +0200
app: don't try to draw a NULL boundary in gimp_region_select_tool_draw()
app/tools/gimpregionselecttool.c | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c
index 86e0ea0..6896b8d 100644
--- a/app/tools/gimpregionselecttool.c
+++ b/app/tools/gimpregionselecttool.c
@@ -315,9 +315,6 @@ gimp_region_select_tool_draw (GimpDrawTool *draw_tool)
if (! options->draw_mask && region_sel->region_mask)
{
- gint off_x = 0;
- gint off_y = 0;
-
if (! region_sel->segs)
{
/* calculate and allocate a new segment array which represents
@@ -334,19 +331,25 @@ gimp_region_select_tool_draw (GimpDrawTool *draw_tool)
}
- if (! options->sample_merged)
+ if (region_sel->segs)
{
- GimpImage *image = gimp_display_get_image (draw_tool->display);
- GimpDrawable *drawable = gimp_image_get_active_drawable (image);
+ gint off_x = 0;
+ gint off_y = 0;
- gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
- }
+ if (! options->sample_merged)
+ {
+ GimpImage *image = gimp_display_get_image (draw_tool->display);
+ GimpDrawable *drawable = gimp_image_get_active_drawable (image);
- gimp_draw_tool_add_boundary (draw_tool,
- region_sel->segs,
- region_sel->n_segs,
- NULL,
- off_x, off_y);
+ gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+ }
+
+ gimp_draw_tool_add_boundary (draw_tool,
+ region_sel->segs,
+ region_sel->n_segs,
+ NULL,
+ off_x, off_y);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]