gimp r24941 - in branches/gimp-2-4: . plug-ins/common

[neo svn gnome org]

Author: neo
Date: Fri Feb 22 07:44:55 2008
New Revision: 24941
URL: http://svn.gnome.org/viewvc/gimp?rev=24941&view=rev

Log:
merged another fix from trunk


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/plug-ins/common/wind.c

Modified: branches/gimp-2-4/plug-ins/common/wind.c
==============================================================================
--- branches/gimp-2-4/plug-ins/common/wind.c	(original)
+++ branches/gimp-2-4/plug-ins/common/wind.c	Fri Feb 22 07:44:55 2008
@@ -310,18 +310,20 @@
   else
     {
       if (gimp_drawable_mask_intersect (drawable->drawable_id,
-                                        &x1, &y1, &x2, &y2))
+                                        &x1, &y1, &width, &height))
         {
           gimp_progress_init (_("Rendering blast"));
 
-          width = x2 - x1;
-          height = y2 - y1;
+          x2 = x1 + width;
+          y2 = y1 + height;
 
           gimp_pixel_rgn_init (&dest_region, drawable,
                                x1, y1, width, height, TRUE, TRUE);
         }
       else
-        return;
+        {
+          return;
+        }
     }
 
   gimp_pixel_rgn_init (&src_region,  drawable,
@@ -356,7 +358,9 @@
       else
         {
           gimp_pixel_rgn_set_row (&dest_region, buffer, x1, row, width);
-          gimp_progress_update ((double) (row - y1)/ (double) (height));
+
+          if (row % 8 == 0)
+            gimp_progress_update ((double) (row - y1)/ (double) (height));
         }
 
       if (marker)
@@ -481,7 +485,9 @@
       else
         {
           gimp_pixel_rgn_set_row (&dest_region, sb, x1, row, width);
-          gimp_progress_update ((double) (row - y1)/ (double) (height));
+
+          if (row % 8 == 0)
+            gimp_progress_update ((double) (row - y1)/ (double) (height));
         }
     }