gimp r24787 - in branches/gimp-2-4: . app/paint

[neo svn gnome org]

Author: neo
Date: Mon Feb  4 15:39:00 2008
New Revision: 24787
URL: http://svn.gnome.org/viewvc/gimp?rev=24787&view=rev

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

	Merged from trunk:

	* app/paint/gimpbrushcore.c (gimp_brush_core_create_bound_segs):
	changed workaround to look at the brush size instead (bug #514309).


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/paint/gimpbrushcore.c

Modified: branches/gimp-2-4/app/paint/gimpbrushcore.c
==============================================================================
--- branches/gimp-2-4/app/paint/gimpbrushcore.c	(original)
+++ branches/gimp-2-4/app/paint/gimpbrushcore.c	Mon Feb  4 15:39:00 2008
@@ -780,17 +780,16 @@
       BoundSeg    *boundary;
       gint         num_groups;
 
-      if (mask->width > 2 && mask->height > 2)
-        {
-          /*  smooth the mask in order to obtain a simpler boundary  */
-          pixel_region_init_temp_buf (&PR, mask,
-                                      1, 1, mask->width - 2, mask->height - 2);
-          smooth_region (&PR);
-        }
-
       pixel_region_init_temp_buf (&PR, mask,
                                   0, 0, mask->width, mask->height);
 
+      /* Large, complex brush outlines are a performance problem.
+       * Smooth the mask in order to obtain a simpler boundary.
+       */
+      if (mask->width > 32 && mask->height > 32)
+        smooth_region (&PR);
+
+
       boundary = boundary_find (&PR, BOUNDARY_WITHIN_BOUNDS,
                                 0, 0, PR.w, PR.h,
                                 0,