[gimp] app: fix the build with MyPaint brushes enabled, and some formatting foo

[Michael Natterer <mitch src gnome org>]

commit 9f9865afb85c2be73fd2b46985b3c2aea5b7395b
Author: Michael Natterer <mitch gimp org>
Date:   Mon May 25 02:15:03 2015 +0200

    app: fix the build with MyPaint brushes enabled, and some formatting foo

 app/core/gimpbrushclipboard.c  |    5 +++--
 app/core/gimpchannel.c         |    6 ++++--
 app/core/gimpdrawable-offset.c |    3 ++-
 app/core/gimplayer.c           |    9 ++++++---
 app/paint/gimpmybrush.c        |    2 ++
 libgimp/gimplayer.c            |    2 +-
 6 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
index 056aa49..0b679ab 100644
--- a/app/core/gimpbrushclipboard.c
+++ b/app/core/gimpbrushclipboard.c
@@ -212,7 +212,7 @@ gimp_brush_clipboard_buffer_changed (Gimp      *gimp,
           dest_buffer = gimp_temp_buf_create_buffer (brush->priv->mask);
 
           gegl_buffer_set_format (dest_buffer, babl_format ("A u8"));
-          gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE, 
+          gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE,
                             dest_buffer, NULL);
 
           g_object_unref (dest_buffer);
@@ -226,7 +226,8 @@ gimp_brush_clipboard_buffer_changed (Gimp      *gimp,
       /*  copy the color channels into the brush's pixmap  */
       dest_buffer = gimp_temp_buf_create_buffer (brush->priv->pixmap);
 
-      gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE, dest_buffer, NULL);
+      gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE,
+                        dest_buffer, NULL);
 
       g_object_unref (dest_buffer);
     }
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index a1dbeaf..1b94ba0 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -875,7 +875,8 @@ gimp_channel_convert_type (GimpDrawable      *drawable,
 
   if (mask_dither_type == 0)
     {
-      gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+      gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                        GEGL_ABYSS_NONE,
                         dest_buffer, NULL);
     }
   else
@@ -1606,7 +1607,8 @@ gimp_channel_new_from_alpha (GimpImage     *image,
   gegl_buffer_set_format (dest_buffer,
                           gimp_drawable_get_component_format (drawable,
                                                               GIMP_ALPHA_CHANNEL));
-  gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+  gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                    GEGL_ABYSS_NONE,
                     dest_buffer, NULL);
   gegl_buffer_set_format (dest_buffer, NULL);
 
diff --git a/app/core/gimpdrawable-offset.c b/app/core/gimpdrawable-offset.c
index df3b6b6..f5923ae 100644
--- a/app/core/gimpdrawable-offset.c
+++ b/app/core/gimpdrawable-offset.c
@@ -208,7 +208,8 @@ gimp_drawable_offset (GimpDrawable   *drawable,
               dest_rect.y = 0;
             }
 
-          gegl_buffer_copy (src_buffer, &src_rect, GEGL_ABYSS_NONE, new_buffer, &dest_rect);
+          gegl_buffer_copy (src_buffer, &src_rect, GEGL_ABYSS_NONE,
+                            new_buffer, &dest_rect);
         }
 
       /*  X offset  */
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 89c9b77..15e1fdb 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -1018,7 +1018,8 @@ gimp_layer_convert_type (GimpDrawable      *drawable,
 
   if (layer_dither_type == 0)
     {
-      gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+      gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                        GEGL_ABYSS_NONE,
                         dest_buffer, NULL);
     }
   else
@@ -1488,7 +1489,8 @@ gimp_layer_create_mask (const GimpLayer *layer,
             gimp_image_get_component_format (image, GIMP_ALPHA_CHANNEL);
 
           gegl_buffer_set_format (dest_buffer, component_format);
-          gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL, GEGL_ABYSS_NONE,
+          gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                            GEGL_ABYSS_NONE,
                             dest_buffer, NULL);
           gegl_buffer_set_format (dest_buffer, NULL);
 
@@ -1551,7 +1553,8 @@ gimp_layer_create_mask (const GimpLayer *layer,
                                               copy_width, copy_height),
                               GEGL_ABYSS_NONE,
                               dest,
-                              GEGL_RECTANGLE (copy_x - offset_x, copy_y - offset_y,
+                              GEGL_RECTANGLE (copy_x - offset_x,
+                                              copy_y - offset_y,
                                               0, 0));
 
             GIMP_CHANNEL (mask)->bounds_known = FALSE;
diff --git a/app/paint/gimpmybrush.c b/app/paint/gimpmybrush.c
index 2d824c0..23a057e 100644
--- a/app/paint/gimpmybrush.c
+++ b/app/paint/gimpmybrush.c
@@ -131,6 +131,7 @@ gimp_mybrush_paint (GimpPaintCore    *paint_core,
                                                 gimp_item_get_height (GIMP_ITEM (drawable))),
                                 gegl_buffer_get_format (buffer));
       gegl_buffer_copy (gimp_drawable_get_buffer (drawable), NULL,
+                        GEGL_ABYSS_NONE,
                         buffer, NULL);
       mypaint_gegl_tiled_surface_set_buffer (mybrush->private->surface, buffer);
       g_object_unref (buffer);
@@ -240,6 +241,7 @@ gimp_mybrush_motion (GimpPaintCore    *paint_core,
 
       gegl_buffer_copy (src,
                         (GeglRectangle *) &rect,
+                        GEGL_ABYSS_NONE,
                         gimp_drawable_get_buffer (drawable),
                         NULL);
 
diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c
index 2a2008c..4af008e 100644
--- a/libgimp/gimplayer.c
+++ b/libgimp/gimplayer.c
@@ -288,7 +288,7 @@ gimp_layer_new_from_surface (gint32                image_ID,
       dest_buffer = gimp_drawable_get_buffer (layer);
 
       gegl_buffer_copy (src_buffer, NULL, GEGL_ABYSS_NONE,
-                       dest_buffer, NULL);
+                        dest_buffer, NULL);
 
       g_object_unref (src_buffer);
       g_object_unref (dest_buffer);