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

[neo svn gnome org]

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

Log:
2008-02-22  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* plug-ins/common/wind.c (render_wind): fixed call to
	gimp_drawable_mask_intersect() which was causing a crash as
	reported in bug #516369.



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:40:07 2008
@@ -437,18 +437,21 @@
     }
   else
     {
-      if (gimp_drawable_mask_intersect (drawable->drawable_id, &x1, &y1, &x2, &y2))
+      if (gimp_drawable_mask_intersect (drawable->drawable_id,
+                                        &x1, &y1, &width, &height))
         {
           gimp_progress_init (_("Rendering wind"));
 
-          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,