From efbc4e61b02546dbf55eda174966a2507bf9b59e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 26 Mar 2012 19:08:14 +0200 Subject: [PATCH] app: more gegl_buffer_iterator_new() updates --- app/core/gimpchannel.c | 8 ++++---- app/core/gimpscanconvert.c | 4 ++-- app/gegl/gimpoperationcagecoefcalc.c | 4 ++-- app/gegl/gimpoperationcagetransform.c | 6 +++--- app/text/gimptextlayer.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 0ed69c2d12..3b1f43d646 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -1082,8 +1082,8 @@ gimp_channel_real_bounds (GimpChannel *channel, buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)); - iter = gegl_buffer_iterator_new (buffer, NULL, babl_format ("Y u8"), - GEGL_BUFFER_READ, 0); + iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y u8"), + GEGL_BUFFER_READ); roi = &iter->roi[0]; while (gegl_buffer_iterator_next (iter)) @@ -1180,8 +1180,8 @@ gimp_channel_real_is_empty (GimpChannel *channel) buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel)); - iter = gegl_buffer_iterator_new (buffer, NULL, babl_format ("Y u8"), - GEGL_BUFFER_READ, 0); + iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y u8"), + GEGL_BUFFER_READ); while (gegl_buffer_iterator_next (iter)) { diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c index 97a267569d..a84a7b224e 100644 --- a/app/core/gimpscanconvert.c +++ b/app/core/gimpscanconvert.c @@ -481,8 +481,8 @@ gimp_scan_convert_render_full (GimpScanConvert *sc, format = babl_format ("Y u8"); bpp = babl_format_get_bytes_per_pixel (format); - iter = gegl_buffer_iterator_new (buffer, NULL, format, - GEGL_BUFFER_WRITE, 0); + iter = gegl_buffer_iterator_new (buffer, NULL, 0, format, + GEGL_BUFFER_WRITE); roi = &iter->roi[0]; while (gegl_buffer_iterator_next (iter)) diff --git a/app/gegl/gimpoperationcagecoefcalc.c b/app/gegl/gimpoperationcagecoefcalc.c index 137010387a..d11c3de84c 100644 --- a/app/gegl/gimpoperationcagecoefcalc.c +++ b/app/gegl/gimpoperationcagecoefcalc.c @@ -20,7 +20,6 @@ #include "config.h" #include -#include #include "libgimpmath/gimpmath.h" @@ -211,7 +210,8 @@ gimp_operation_cage_coef_calc_process (GeglOperation *operation, n_cage_vertices = gimp_cage_config_get_n_points (config); - it = gegl_buffer_iterator_new (output, roi, 0, format, GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE); + it = gegl_buffer_iterator_new (output, roi, 0, format, + GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE); while (gegl_buffer_iterator_next (it)) { diff --git a/app/gegl/gimpoperationcagetransform.c b/app/gegl/gimpoperationcagetransform.c index abdfa4ee19..edc1f01383 100644 --- a/app/gegl/gimpoperationcagetransform.c +++ b/app/gegl/gimpoperationcagetransform.c @@ -21,7 +21,6 @@ #include #include -#include #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" @@ -244,14 +243,15 @@ gimp_operation_cage_transform_process (GeglOperation *operation, guint n_cage_vertices; /* pre-fill the out buffer with no-displacement coordinate */ - it = gegl_buffer_iterator_new (out_buf, roi, 0, NULL, GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE); + it = gegl_buffer_iterator_new (out_buf, roi, 0, NULL, + GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE); cage_bb = gimp_cage_config_get_bounding_box (config); point = &(g_array_index (config->cage_points, GimpCagePoint, 0)); plain_color.x = (gint) point->src_point.x; plain_color.y = (gint) point->src_point.y; - n_cage_vertices = gimp_cage_config_get_n_points (config); + n_cage_vertices = gimp_cage_config_get_n_points (config); while (gegl_buffer_iterator_next (it)) { diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c index 1a7a61e5d1..fe2588445b 100644 --- a/app/text/gimptextlayer.c +++ b/app/text/gimptextlayer.c @@ -685,8 +685,8 @@ gimp_text_layer_render_layout (GimpTextLayer *layer, fish = babl_fish (babl_format ("RGBA u8"), format); bytes = babl_format_get_bytes_per_pixel (format); - iter = gegl_buffer_iterator_new (buffer, NULL, format, - GEGL_BUFFER_WRITE, 0); + iter = gegl_buffer_iterator_new (buffer, NULL, 0, format, + GEGL_BUFFER_WRITE); while (gegl_buffer_iterator_next (iter)) {