[gimp/goat-invasion: 448/526] app: pass the paint area's coords to gimp_brush_core_color_area_with_pixmap()

[Michael Natterer <mitch src gnome org>]

commit 5d5fffaa012fc707c655aeaf4cf102f34e7a2a9b
Author: Michael Natterer <mitch gimp org>
Date:   Sat Apr 7 23:38:46 2012 +0200

    app: pass the paint area's coords to gimp_brush_core_color_area_with_pixmap()
    
    They are no longer stored in the paint area TempBuf.

 app/paint/gimpbrushcore.c  |    6 ++++--
 app/paint/gimpbrushcore.h  |    2 ++
 app/paint/gimppaintbrush.c |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index 2197940..f3fb9fb 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -1545,6 +1545,8 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore            *core,
                                         GimpDrawable             *drawable,
                                         const GimpCoords         *coords,
                                         TempBuf                  *area,
+                                        gint                      area_x,
+                                        gint                      area_y,
                                         GimpBrushApplicationMode  mode)
 {
   GimpImage     *image;
@@ -1594,8 +1596,8 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore            *core,
   if (pixmap_mask->height %2 == 0)
     uly += ROUND (coords->y) - floor (coords->y);
 
-  offsetx = area->x - ulx;
-  offsety = area->y - uly;
+  offsetx = area_x - ulx;
+  offsety = area_y - uly;
 
   for (; pr != NULL; pr = pixel_regions_process (pr))
     {
diff --git a/app/paint/gimpbrushcore.h b/app/paint/gimpbrushcore.h
index 1c9ae38..ba24d65 100644
--- a/app/paint/gimpbrushcore.h
+++ b/app/paint/gimpbrushcore.h
@@ -122,6 +122,8 @@ void   gimp_brush_core_color_area_with_pixmap
                                        GimpDrawable             *drawable,
                                        const GimpCoords         *coords,
                                        TempBuf                  *area,
+                                       gint                      area_x,
+                                       gint                      area_y,
                                        GimpBrushApplicationMode  mode);
 
 const TempBuf * gimp_brush_core_get_brush_mask
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
index 2684892..a4a07a3 100644
--- a/app/paint/gimppaintbrush.c
+++ b/app/paint/gimppaintbrush.c
@@ -185,6 +185,8 @@ _gimp_paintbrush_motion (GimpPaintCore    *paint_core,
       gimp_brush_core_color_area_with_pixmap (brush_core, drawable,
                                               coords,
                                               area,
+                                              paint_buffer_x,
+                                              paint_buffer_y,
                                               gimp_paint_options_get_brush_mode (paint_options));
 
       paint_appl_mode = GIMP_PAINT_INCREMENTAL;