diff --git a/ChangeLog b/ChangeLog
index 26bc5999d7..f648643fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-19  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/warp.c: use gimp_drawable_mask_intersect()
+	instead of gimp_drawable_mask_bounds().
+
 2005-10-19  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpcurvestool.[ch]: added keyboard control to the
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 3b9627a2e3..5c0f34b28f 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -1210,8 +1210,6 @@ warp (GimpDrawable  *orig_draw,
   GimpDrawable *disp_map;    /* Displacement map, ie, control array */
   GimpDrawable *mag_draw;    /* Magnitude multiplier factor map */
 
-  gchar *string;          /* string to hold title of progress bar window */
-
   gint    first_time = TRUE;
   gint    width;
   gint    height;
@@ -1352,8 +1350,7 @@ warp_one (GimpDrawable *draw,
 
   /* Get selection area */
 
-  if (! gimp_drawable_mask_bounds (draw->drawable_id,
-                                   &x1, &y1, &x2, &y2))
+  if (! gimp_drawable_mask_intersect (draw->drawable_id, &x1, &y1, &x2, &y2))
     return;
 
    width  = draw->width;
@@ -1367,7 +1364,8 @@ warp_one (GimpDrawable *draw,
 
    /*  --------- Register the (many) pixel regions ----------  */
 
-   gimp_pixel_rgn_init (&src_rgn, draw, x1, y1, (x2 - x1), (y2 - y1), FALSE, FALSE);
+   gimp_pixel_rgn_init (&src_rgn, draw,
+                        x1, y1, (x2 - x1), (y2 - y1), FALSE, FALSE);
 
    /* only push undo-stack the first time through. Thanks Spencer! */
    if (first_time==TRUE)