gimp r25309 - trunk/app/paint

[neo svn gnome org]

Author: neo
Date: Sun Mar 30 14:38:59 2008
New Revision: 25309
URL: http://svn.gnome.org/viewvc/gimp?rev=25309&view=rev

Log:
2008-03-30  Sven Neumann  <sven gimp org>

	Merged Bill's changes for bug #521433 from trunk with some minor
	cleanups:

	* app/paint/gimpbrushcore.[ch]: made
	gimp_brush_core_get_brush_mask() public.

	* app/paint/gimpheal.c: respect the brush mask.



Modified:
   trunk/app/paint/gimpheal.c

Modified: trunk/app/paint/gimpheal.c
==============================================================================
--- trunk/app/paint/gimpheal.c	(original)
+++ trunk/app/paint/gimpheal.c	Sun Mar 30 14:38:59 2008
@@ -427,7 +427,6 @@
                   gint              paint_area_height)
 {
   GimpPaintCore *paint_core = GIMP_PAINT_CORE (source_core);
-  GimpBrushCore *brush_core = GIMP_BRUSH_CORE (source_core);
   GimpContext   *context    = GIMP_CONTEXT (paint_options);
   TempBuf       *src;
   TempBuf       *temp;
@@ -437,7 +436,7 @@
   GimpImageType  src_type;
   TempBuf       *mask_buf;
 
-  mask_buf = gimp_brush_core_get_brush_mask (brush_core,
+  mask_buf = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (source_core),
                                              GIMP_BRUSH_HARD);
 
   src_type = gimp_pickable_get_image_type (src_pickable);
@@ -522,13 +521,10 @@
       /* this generally means that the source point has hit the edge of the
          layer, so it is not an error and we should not complain, just
          don't do anything */
-      g_print ("shape mismatch in gimpheal\n");
-      g_print ("src width = %d\n", srcPR->w);
-      g_print ("src height = %d\n", srcPR->h);
-      g_print ("mask width = %d\n", mask_buf->width);
-      g_print ("mask height = %d\n", mask_buf->height);
+
       temp_buf_free (src);
       temp_buf_free (temp);
+
       return;
     }