[gimp/goat-invasion: 262/526] app: update with GEGL iterator API changes

[Michael Natterer <mitch src gnome org>]

commit 2e55f26273c6e6add95abb215de5bfaa4c891489
Author: Ãyvind KolÃs <pippin gimp org>
Date:   Mon Mar 26 17:31:53 2012 +0100

    app: update with GEGL iterator API changes

 app/core/gimpchannel-combine.c |   10 +++++-----
 app/core/gimppalette-import.c  |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c
index 4d9bb9e..b0fd716 100644
--- a/app/core/gimpchannel-combine.c
+++ b/app/core/gimpchannel-combine.c
@@ -237,8 +237,8 @@ gimp_channel_combine_ellipse_rect (GimpChannel    *mask,
   buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (mask));
 
   iter = gegl_buffer_iterator_new (buffer,
-                                   GIMP_GEGL_RECT (x0, y0, width, height),
-                                   babl_format ("Y u8"), GEGL_BUFFER_READWRITE, 0);
+                                   GIMP_GEGL_RECT (x0, y0, width, height), 0,
+                                   babl_format ("Y u8"), GEGL_BUFFER_READWRITE);
   roi = &iter->roi[0];
   bpp = 1;
 
@@ -463,13 +463,13 @@ gimp_channel_combine_mask (GimpChannel    *mask,
   rect.width  = w;
   rect.height = h;
 
-  iter = gegl_buffer_iterator_new (mask_buffer, &rect, babl_format ("Y u8"),
-                                   GEGL_BUFFER_READWRITE, 0);
+  iter = gegl_buffer_iterator_new (mask_buffer, &rect, 0, babl_format ("Y u8"),
+                                   GEGL_BUFFER_READWRITE);
 
   rect.x -= off_x;
   rect.y -= off_y;
 
-  gegl_buffer_iterator_add (iter, add_on_buffer, &rect, babl_format ("Y u8"),
+  gegl_buffer_iterator_add (iter, add_on_buffer, &rect, 0, babl_format ("Y u8"),
                             GEGL_BUFFER_READ);
 
   switch (op)
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index c0601b0..538fb89 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -289,8 +289,8 @@ gimp_palette_import_extract (GimpImage     *image,
 
   format = gimp_pickable_get_format (pickable);
 
-  iter = gegl_buffer_iterator_new (buffer, &rect, format,
-                                   GEGL_BUFFER_READ, 0);
+  iter = gegl_buffer_iterator_new (buffer, &rect, 0, format,
+                                   GEGL_BUFFER_READ);
   roi = &iter->roi[0];
   bpp = babl_format_get_bytes_per_pixel (format);
 
@@ -306,7 +306,7 @@ gimp_palette_import_extract (GimpImage     *image,
 
       format = gimp_drawable_get_format (mask);
 
-      gegl_buffer_iterator_add (iter, buffer, &rect,
+      gegl_buffer_iterator_add (iter, buffer, &rect, 0,
                                 gimp_drawable_get_format (mask),
                                 GEGL_BUFFER_READ);
       mask_roi = &iter->roi[1];