[gimp] app: use the update_area passed to gimp_image_map_apply



commit fd26c2eed498881985f26a6c6033fb8a9530e86e
Author: Massimo Valentini <mvalentini src gnome org>
Date:   Tue May 21 19:04:57 2013 +0200

    app: use the update_area passed to gimp_image_map_apply

 app/core/gimpimagemap.c |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/app/core/gimpimagemap.c b/app/core/gimpimagemap.c
index 9d44974..bd25a03 100644
--- a/app/core/gimpimagemap.c
+++ b/app/core/gimpimagemap.c
@@ -224,26 +224,25 @@ gimp_image_map_apply (GimpImageMap        *image_map,
     }
 
   /* Only update "area" because only that has changed */
-  if (area &&
-      ! gimp_rectangle_intersect (area->x,
-                                  area->y,
-                                  area->width,
-                                  area->height,
-                                  image_map->filter_area.x,
-                                  image_map->filter_area.y,
-                                  image_map->filter_area.width,
-                                  image_map->filter_area.height,
-                                  &update_area.x,
-                                  &update_area.y,
-                                  &update_area.width,
-                                  &update_area.height))
+  if (! area)
     {
-      /* Bail out, but don't remove the filter */
-      return;
+      update_area = image_map->filter_area;
     }
-  else
+  else if (! gimp_rectangle_intersect (area->x,
+                                       area->y,
+                                       area->width,
+                                       area->height,
+                                       image_map->filter_area.x,
+                                       image_map->filter_area.y,
+                                       image_map->filter_area.width,
+                                       image_map->filter_area.height,
+                                       &update_area.x,
+                                       &update_area.y,
+                                       &update_area.width,
+                                       &update_area.height))
     {
-      update_area = image_map->filter_area;
+      /* Bail out, but don't remove the filter */
+      return;
     }
 
   if (! image_map->filter)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]