[gimp/goat-invasion: 244/418] app: sprinkle level argument over process functions
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/goat-invasion: 244/418] app: sprinkle level argument over process functions
- Date: Wed, 4 Apr 2012 10:46:18 +0000 (UTC)
commit 018f457c5608cc3bf237a509323bf9bc1dada25a
Author: Ãyvind KolÃs <pippin gimp org>
Date: Sun Mar 25 04:51:55 2012 +0100
app: sprinkle level argument over process functions
app/core/gimpboundary.c | 4 ++--
app/core/gimpbuffer.c | 2 +-
app/core/gimpchannel-combine.c | 4 ++--
app/core/gimpchannel.c | 4 ++--
app/core/gimpdrawable-transform.c | 12 ++++++------
app/core/gimpimage-crop.c | 8 ++++----
app/core/gimppalette-import.c | 2 +-
app/core/gimppatternclipboard.c | 4 ++--
app/core/gimpscanconvert.c | 2 +-
app/gegl/gimp-gegl-nodes.c | 2 +-
app/gegl/gimpoperationequalize.c | 6 ++++--
app/gegl/gimpoperationnormalmode.c | 15 ++++++++++-----
app/gegl/gimpoperationsetalpha.c | 6 ++++--
app/text/gimptextlayer.c | 2 +-
14 files changed, 41 insertions(+), 32 deletions(-)
---
diff --git a/app/core/gimpboundary.c b/app/core/gimpboundary.c
index 154a748..f393bf4 100644
--- a/app/core/gimpboundary.c
+++ b/app/core/gimpboundary.c
@@ -710,7 +710,7 @@ generate_boundary (GeglBuffer *buffer,
threshold);
line_rect.y = start;
- gegl_buffer_get (buffer, 1.0, &line_rect, format,
+ gegl_buffer_get (buffer, &line_rect, 1.0, format,
line_data, GEGL_AUTO_ROWSTRIDE);
find_empty_segs (region, line_data, bpp,
@@ -726,7 +726,7 @@ generate_boundary (GeglBuffer *buffer,
if (scanline + 1 == end)
line_data = NULL;
else
- gegl_buffer_get (buffer, 1.0, &line_rect, format,
+ gegl_buffer_get (buffer, &line_rect, 1.0, format,
line_data, GEGL_AUTO_ROWSTRIDE);
find_empty_segs (region, line_data, bpp,
diff --git a/app/core/gimpbuffer.c b/app/core/gimpbuffer.c
index 5466b0c..9e81cfa 100644
--- a/app/core/gimpbuffer.c
+++ b/app/core/gimpbuffer.c
@@ -202,9 +202,9 @@ gimp_buffer_get_new_preview (GimpViewable *viewable,
0, 0, NULL);
gegl_buffer_get (buffer->buffer,
+ NULL,
MIN ((gdouble) width / (gdouble) gimp_buffer_get_width (buffer),
(gdouble) height / (gdouble) gimp_buffer_get_height (buffer)),
- NULL,
gimp_bpp_to_babl_format (gimp_buffer_get_bytes (buffer),
TRUE),
temp_buf_get_data (preview),
diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c
index 8461cb5..4d9bb9e 100644
--- a/app/core/gimpchannel-combine.c
+++ b/app/core/gimpchannel-combine.c
@@ -238,7 +238,7 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
iter = gegl_buffer_iterator_new (buffer,
GIMP_GEGL_RECT (x0, y0, width, height),
- babl_format ("Y u8"), GEGL_BUFFER_READWRITE);
+ babl_format ("Y u8"), GEGL_BUFFER_READWRITE, 0);
roi = &iter->roi[0];
bpp = 1;
@@ -464,7 +464,7 @@ gimp_channel_combine_mask (GimpChannel *mask,
rect.height = h;
iter = gegl_buffer_iterator_new (mask_buffer, &rect, babl_format ("Y u8"),
- GEGL_BUFFER_READWRITE);
+ GEGL_BUFFER_READWRITE, 0);
rect.x -= off_x;
rect.y -= off_y;
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 87e3ac2..64663d8 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -1091,7 +1091,7 @@ 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);
+ GEGL_BUFFER_READ, 0);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
@@ -1189,7 +1189,7 @@ 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);
+ GEGL_BUFFER_READ, 0);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c
index 4b7c728..8314316 100644
--- a/app/core/gimpdrawable-transform.c
+++ b/app/core/gimpdrawable-transform.c
@@ -580,9 +580,9 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
src_rect.y = orig_y + orig_height - 1 - i;
dest_rect.x = new_x + i;
- gegl_buffer_get (orig_buffer, 1.0, &src_rect, NULL, buf,
+ gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_set (new_buffer, &dest_rect, NULL, buf,
+ gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
}
@@ -608,7 +608,7 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
src_rect.y = orig_y + orig_height - 1 - i;
dest_rect.y = new_y + i;
- gegl_buffer_get (orig_buffer, 1.0, &src_rect, NULL, buf,
+ gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
for (j = 0; j < orig_width / 2; j++)
@@ -624,7 +624,7 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
}
}
- gegl_buffer_set (new_buffer, &dest_rect, NULL, buf,
+ gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
}
@@ -650,9 +650,9 @@ gimp_drawable_transform_buffer_rotate (GimpDrawable *drawable,
src_rect.x = orig_x + orig_width - 1 - i;
dest_rect.y = new_y + i;
- gegl_buffer_get (orig_buffer, 1.0, &src_rect, NULL, buf,
+ gegl_buffer_get (orig_buffer, &src_rect, 1.0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_set (new_buffer, &dest_rect, NULL, buf,
+ gegl_buffer_set (new_buffer, &dest_rect, 0, NULL, buf,
GEGL_AUTO_ROWSTRIDE);
}
diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c
index 48d7f00..e31d62a 100644
--- a/app/core/gimpimage-crop.c
+++ b/app/core/gimpimage-crop.c
@@ -389,7 +389,7 @@ gimp_image_crop_auto_shrink (GimpImage *image,
for (y = y1; y < y2 && !abort; y++)
{
rect.y = y;
- gegl_buffer_get (buffer, 1.0, &rect, NULL, buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, &rect, 1.0, NULL, buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < width && !abort; x++)
abort = !(colors_equal_func) (bgcolor, buf + x * bytes, bytes);
}
@@ -407,7 +407,7 @@ gimp_image_crop_auto_shrink (GimpImage *image,
for (y = y2; y > y1 && !abort; y--)
{
rect.y = y - 1;
- gegl_buffer_get (buffer, 1.0, &rect, NULL, buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, &rect, 1.0, NULL, buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < width && !abort; x++)
abort = !(colors_equal_func) (bgcolor, buf + x * bytes, bytes);
}
@@ -426,7 +426,7 @@ gimp_image_crop_auto_shrink (GimpImage *image,
for (x = x1; x < x2 && !abort; x++)
{
rect.x = x;
- gegl_buffer_get (buffer, 1.0, &rect, NULL, buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, &rect, 1.0, NULL, buf, GEGL_AUTO_ROWSTRIDE);
for (y = 0; y < height && !abort; y++)
abort = !(colors_equal_func) (bgcolor, buf + y * bytes, bytes);
}
@@ -442,7 +442,7 @@ gimp_image_crop_auto_shrink (GimpImage *image,
for (x = x2; x > x1 && !abort; x--)
{
rect.x = x - 1;
- gegl_buffer_get (buffer, 1.0, &rect, NULL, buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, &rect, 1.0, NULL, buf, GEGL_AUTO_ROWSTRIDE);
for (y = 0; y < height && !abort; y++)
abort = !(colors_equal_func) (bgcolor, buf + y * bytes, bytes);
}
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index b712309..c0601b0 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -290,7 +290,7 @@ gimp_palette_import_extract (GimpImage *image,
format = gimp_pickable_get_format (pickable);
iter = gegl_buffer_iterator_new (buffer, &rect, format,
- GEGL_BUFFER_READ);
+ GEGL_BUFFER_READ, 0);
roi = &iter->roi[0];
bpp = babl_format_get_bytes_per_pixel (format);
diff --git a/app/core/gimppatternclipboard.c b/app/core/gimppatternclipboard.c
index 4e8fdac..0e211e6 100644
--- a/app/core/gimppatternclipboard.c
+++ b/app/core/gimppatternclipboard.c
@@ -199,8 +199,8 @@ gimp_pattern_clipboard_buffer_changed (Gimp *gimp,
pattern->mask = temp_buf_new (width, height, bytes, 0, 0, NULL);
- gegl_buffer_get (gimp_buffer_get_buffer (buffer), 1.0,
- GIMP_GEGL_RECT (0,0,width,height),
+ gegl_buffer_get (gimp_buffer_get_buffer (buffer),
+ GIMP_GEGL_RECT (0,0,width,height), 1.0,
gimp_bpp_to_babl_format (bytes, TRUE),
temp_buf_get_data (pattern->mask),
width * gimp_buffer_get_bytes (buffer));
diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c
index ccc0927..97a2675 100644
--- a/app/core/gimpscanconvert.c
+++ b/app/core/gimpscanconvert.c
@@ -482,7 +482,7 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
bpp = babl_format_get_bytes_per_pixel (format);
iter = gegl_buffer_iterator_new (buffer, NULL, format,
- GEGL_BUFFER_WRITE);
+ GEGL_BUFFER_WRITE, 0);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index a3b948f..dc00c43 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -189,7 +189,7 @@ gimp_gegl_create_apply_buffer_node (GeglBuffer *buffer,
gegl_node_connect_to (mask_source, "output",
opacity_node, "aux");
- mode_node = gegl_node_new_child (node, NULL);
+ mode_node = gegl_node_new_child (node, NULL, NULL);
gimp_gegl_node_set_layer_mode (node, mode, FALSE);
gegl_node_connect_to (opacity_node, "output",
diff --git a/app/gegl/gimpoperationequalize.c b/app/gegl/gimpoperationequalize.c
index fc78cad..2986f5f 100644
--- a/app/gegl/gimpoperationequalize.c
+++ b/app/gegl/gimpoperationequalize.c
@@ -54,7 +54,8 @@ static gboolean gimp_operation_equalize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi);
+ const GeglRectangle *roi,
+ gint level);
G_DEFINE_TYPE (GimpOperationEqualize, gimp_operation_equalize,
@@ -202,7 +203,8 @@ gimp_operation_equalize_process (GeglOperation *operation,
void *in_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi)
+ const GeglRectangle *roi,
+ gint level)
{
GimpOperationEqualize *self = GIMP_OPERATION_EQUALIZE (operation);
gfloat *src = in_buf;
diff --git a/app/gegl/gimpoperationnormalmode.c b/app/gegl/gimpoperationnormalmode.c
index 2dd5bae..5b5a999 100644
--- a/app/gegl/gimpoperationnormalmode.c
+++ b/app/gegl/gimpoperationnormalmode.c
@@ -31,13 +31,15 @@
static gboolean gimp_operation_normal_parent_process (GeglOperation *operation,
GeglOperationContext *context,
const gchar *output_prop,
- const GeglRectangle *result);
+ const GeglRectangle *result,
+ gint level);
static gboolean gimp_operation_normal_mode_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi);
+ const GeglRectangle *roi,
+ gint level);
G_DEFINE_TYPE (GimpOperationNormalMode, gimp_operation_normal_mode,
@@ -71,7 +73,8 @@ static gboolean
gimp_operation_normal_parent_process (GeglOperation *operation,
GeglOperationContext *context,
const gchar *output_prop,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
const GeglRectangle *in_extent = NULL;
const GeglRectangle *aux_extent = NULL;
@@ -109,7 +112,8 @@ gimp_operation_normal_parent_process (GeglOperation *operation,
* process function
*/
return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
- output_prop, result);
+ output_prop, result,
+ level);
}
static gboolean
@@ -118,7 +122,8 @@ gimp_operation_normal_mode_process (GeglOperation *operation,
void *aux_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi)
+ const GeglRectangle *roi,
+ gint level)
{
GimpOperationPointLayerMode *point = GIMP_OPERATION_POINT_LAYER_MODE (operation);
gfloat *in = in_buf;
diff --git a/app/gegl/gimpoperationsetalpha.c b/app/gegl/gimpoperationsetalpha.c
index 0fd2513..bbf8bcd 100644
--- a/app/gegl/gimpoperationsetalpha.c
+++ b/app/gegl/gimpoperationsetalpha.c
@@ -49,7 +49,8 @@ static gboolean gimp_operation_set_alpha_process (GeglOperation *operat
void *aux_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi);
+ const GeglRectangle *roi,
+ gint level);
G_DEFINE_TYPE (GimpOperationSetAlpha, gimp_operation_set_alpha,
@@ -143,7 +144,8 @@ gimp_operation_set_alpha_process (GeglOperation *operation,
void *aux_buf,
void *out_buf,
glong samples,
- const GeglRectangle *roi)
+ const GeglRectangle *roi,
+ gint level)
{
GimpOperationSetAlpha *self = GIMP_OPERATION_SET_ALPHA (operation);
gfloat *src = in_buf;
diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c
index ea46cca..1a7a61e 100644
--- a/app/text/gimptextlayer.c
+++ b/app/text/gimptextlayer.c
@@ -686,7 +686,7 @@ gimp_text_layer_render_layout (GimpTextLayer *layer,
bytes = babl_format_get_bytes_per_pixel (format);
iter = gegl_buffer_iterator_new (buffer, NULL, format,
- GEGL_BUFFER_WRITE);
+ GEGL_BUFFER_WRITE, 0);
while (gegl_buffer_iterator_next (iter))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
