[gegl] ops/workshop: adapt to newer API
- From: Ãyvind KolÃs <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] ops/workshop: adapt to newer API
- Date: Sun, 25 Mar 2012 13:10:53 +0000 (UTC)
commit 859631658647f52049bb5f0e8a0b420ca341de41
Author: Ãyvind KolÃs <pippin gimp org>
Date: Sun Mar 25 14:10:43 2012 +0100
ops/workshop: adapt to newer API
operations/workshop/box-max.c | 12 +-
operations/workshop/box-min.c | 12 +-
operations/workshop/box-percentile.c | 6 +-
operations/workshop/buffer-cache.c | 3 +-
operations/workshop/color-reduction.c | 20 +-
operations/workshop/color-rotate.c | 7 +-
operations/workshop/color-to-alpha.c | 7 +-
operations/workshop/convolution-matrix.c | 9 +-
operations/workshop/cubism.c | 5 +-
operations/workshop/deinterlace.c | 9 +-
operations/workshop/demosaic-bimedian.c | 4 +-
operations/workshop/demosaic-simple.c | 4 +-
operations/workshop/disc-percentile.c | 4 +-
operations/workshop/ditto.c | 5 +-
operations/workshop/emboss.c | 7 +-
operations/workshop/external/line-profile.c | 4 +-
operations/workshop/fractal-trace.c | 5 +-
operations/workshop/generated/average.c | 3 +-
operations/workshop/hstack.c | 8 +-
operations/workshop/kuwahara-max.c | 4 +-
operations/workshop/kuwahara-min.c | 4 +-
operations/workshop/kuwahara.c | 4 +-
operations/workshop/lens-correct.c | 408 ---------------------------
operations/workshop/lens-distortion.c | 7 +-
operations/workshop/mandelbrot.c | 4 +-
operations/workshop/noise-spread.c | 2 +-
operations/workshop/plasma.c | 9 +-
operations/workshop/polar-coordinates.c | 7 +-
operations/workshop/rawbayer-load.c | 6 +-
operations/workshop/red-eye-removal.c | 7 +-
operations/workshop/ripple.c | 5 +-
operations/workshop/snn-percentile.c | 4 +-
operations/workshop/warp.c | 7 +-
operations/workshop/waves.c | 5 +-
operations/workshop/whirl-pinch.c | 2 +-
35 files changed, 115 insertions(+), 504 deletions(-)
---
diff --git a/operations/workshop/box-max.c b/operations/workshop/box-max.c
index 1bb654b..f15c556 100644
--- a/operations/workshop/box-max.c
+++ b/operations/workshop/box-max.c
@@ -83,7 +83,7 @@ hor_max (GeglBuffer *src,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 4);
dst_buf = g_new0 (gfloat, dst_rect->width * dst_rect->height * 4);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<dst_rect->height; v++)
@@ -102,8 +102,8 @@ hor_max (GeglBuffer *src,
i);
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGBA float"), dst_buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGBA float"), dst_buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -124,7 +124,7 @@ ver_max (GeglBuffer *src,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 4);
dst_buf = g_new0 (gfloat, dst_rect->width * src_rect->height * 4);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (v=0; v<dst_rect->height; v++)
@@ -144,8 +144,8 @@ ver_max (GeglBuffer *src,
c);
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGBA float"), dst_buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGBA float"), dst_buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/box-min.c b/operations/workshop/box-min.c
index 8b177ee..0583b4a 100644
--- a/operations/workshop/box-min.c
+++ b/operations/workshop/box-min.c
@@ -83,7 +83,7 @@ hor_min (GeglBuffer *src,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 4);
dst_buf = g_new0 (gfloat, dst_rect->width * dst_rect->height * 4);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<dst_rect->height; v++)
@@ -102,8 +102,8 @@ hor_min (GeglBuffer *src,
i);
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGBA float"), dst_buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGBA float"), dst_buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -124,7 +124,7 @@ ver_min (GeglBuffer *src,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 4);
dst_buf = g_new0 (gfloat, dst_rect->width * src_rect->height * 4);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (v=0; v<dst_rect->height; v++)
@@ -144,8 +144,8 @@ ver_min (GeglBuffer *src,
c);
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGBA float"), dst_buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGBA float"), dst_buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/box-percentile.c b/operations/workshop/box-percentile.c
index c4ffee6..6cab8ba 100644
--- a/operations/workshop/box-percentile.c
+++ b/operations/workshop/box-percentile.c
@@ -173,7 +173,7 @@ median (GeglBuffer *src,
src_buf = g_malloc0 (gegl_buffer_get_pixel_count (src) * 4 * 4);
dst_buf = g_malloc0 (gegl_buffer_get_pixel_count (dst) * 4 * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (y=0; y<gegl_buffer_get_height (dst); y++)
@@ -203,8 +203,8 @@ median (GeglBuffer *src,
dst_buf[offset*4+u] = median_pix[u];
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/buffer-cache.c b/operations/workshop/buffer-cache.c
index 707e0a5..689c660 100644
--- a/operations/workshop/buffer-cache.c
+++ b/operations/workshop/buffer-cache.c
@@ -54,7 +54,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
diff --git a/operations/workshop/color-reduction.c b/operations/workshop/color-reduction.c
index 6264bd4..a0fe29e 100644
--- a/operations/workshop/color-reduction.c
+++ b/operations/workshop/color-reduction.c
@@ -113,7 +113,7 @@ process_floyd_steinberg (GeglBuffer *input,
/* Pull input row */
- gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &line_rect, 1.0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
/* Process the row */
@@ -165,7 +165,7 @@ process_floyd_steinberg (GeglBuffer *input,
/* Push output row */
- gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, &line_rect, 0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -210,7 +210,7 @@ process_bayer (GeglBuffer *input,
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &line_rect, 1.0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width; x++)
{
@@ -231,7 +231,7 @@ process_bayer (GeglBuffer *input,
}
}
- gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, &line_rect, 0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -262,7 +262,7 @@ process_random_covariant (GeglBuffer *input,
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &line_rect, 1.0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width; x++)
{
@@ -284,7 +284,7 @@ process_random_covariant (GeglBuffer *input,
}
}
- gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, &line_rect, 0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -315,7 +315,7 @@ process_random (GeglBuffer *input,
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &line_rect, 1.0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width; x++)
{
@@ -336,7 +336,7 @@ process_random (GeglBuffer *input,
}
}
- gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, &line_rect, 0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -367,7 +367,7 @@ process_no_dither (GeglBuffer *input,
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &line_rect, 1.0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width; x++)
{
@@ -380,7 +380,7 @@ process_no_dither (GeglBuffer *input,
}
}
- gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, &line_rect, 0, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
diff --git a/operations/workshop/color-rotate.c b/operations/workshop/color-rotate.c
index 3c7af5d..4dd6add 100644
--- a/operations/workshop/color-rotate.c
+++ b/operations/workshop/color-rotate.c
@@ -341,7 +341,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
const Babl *format = babl_format ("RGBA float");
@@ -352,12 +353,12 @@ process (GeglOperation *operation,
format = babl_format ("RGBA float");
- gegl_buffer_get (input, 1.0, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, result, 1.0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width * result->height; x++)
color_rotate (src_buf, 4 * x, o);
- gegl_buffer_set (output, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
diff --git a/operations/workshop/color-to-alpha.c b/operations/workshop/color-to-alpha.c
index 2d10d41..4b6895c 100644
--- a/operations/workshop/color-to-alpha.c
+++ b/operations/workshop/color-to-alpha.c
@@ -126,7 +126,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
const Babl *format = babl_format ("RGBA float");
@@ -135,14 +136,14 @@ process (GeglOperation *operation,
src_buf = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (input, 1.0, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, result, 1.0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
gegl_color_get_rgba4f (o->value, color);
for (x = 0; x < result->width * result->height; x++)
color_to_alpha (color, src_buf, 4 * x);
- gegl_buffer_set (output, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
diff --git a/operations/workshop/convolution-matrix.c b/operations/workshop/convolution-matrix.c
index 4bb023d..6431856 100644
--- a/operations/workshop/convolution-matrix.c
+++ b/operations/workshop/convolution-matrix.c
@@ -322,7 +322,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
GeglOperationAreaFilter *op_area = GEGL_OPERATION_AREA_FILTER (operation);
@@ -361,7 +362,7 @@ process (GeglOperation *operation,
src_buf = g_new0 (gfloat, rect.width * rect.height * 4);
dst_buf = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (input, 1.0, &rect, babl_format (type),
+ gegl_buffer_get (input, &rect, 1.0, babl_format (type),
src_buf, GEGL_AUTO_ROWSTRIDE);
/*fill src_buf with wrap pixels if it is the case*/
@@ -373,11 +374,11 @@ process (GeglOperation *operation,
convolve_pixel (src_buf, dst_buf, result, &rect, &boundary,
matrix, o, input, x, y, matrixsum);
- gegl_buffer_set (output, result, babl_format (type),
+ gegl_buffer_set (output, result, 0, babl_format (type),
dst_buf, GEGL_AUTO_ROWSTRIDE);
}
else
- gegl_buffer_set (output, &rect, babl_format (type),
+ gegl_buffer_set (output, &rect, 0, babl_format (type),
src_buf, GEGL_AUTO_ROWSTRIDE);
diff --git a/operations/workshop/cubism.c b/operations/workshop/cubism.c
index 6ad11f2..095edb4 100644
--- a/operations/workshop/cubism.c
+++ b/operations/workshop/cubism.c
@@ -438,7 +438,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
GeglOperationAreaFilter *op_area = GEGL_OPERATION_AREA_FILTER (operation);
@@ -519,7 +520,7 @@ process (GeglOperation *operation,
fill_poly_color (&poly, &extended, &boundary, dst_buf, color);
}
- gegl_buffer_set (output, &extended, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &extended, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (dst_buf);
g_free (random_indices);
diff --git a/operations/workshop/deinterlace.c b/operations/workshop/deinterlace.c
index 3b953ea..92aeb5a 100644
--- a/operations/workshop/deinterlace.c
+++ b/operations/workshop/deinterlace.c
@@ -214,7 +214,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
GeglOperationAreaFilter *op_area = GEGL_OPERATION_AREA_FILTER (operation);
@@ -236,8 +237,8 @@ process (GeglOperation *operation,
dst_buf = g_new0 (gfloat, result->height * result->width * 4);
src_buf = g_new0 (gfloat, rect.height * rect.width * 4);
- gegl_buffer_get (input, 1.0, result, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (input, 1.0, &rect, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, result, 1.0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, &rect, 1.0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
if (o->horizontal)
{
@@ -256,7 +257,7 @@ process (GeglOperation *operation,
x, o->size);
}
- gegl_buffer_set (output, result, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
diff --git a/operations/workshop/demosaic-bimedian.c b/operations/workshop/demosaic-bimedian.c
index 34a03ba..2d599c9 100644
--- a/operations/workshop/demosaic-bimedian.c
+++ b/operations/workshop/demosaic-bimedian.c
@@ -93,7 +93,7 @@ demosaic (GeglChantO *op,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 1);
dst_buf = g_new0 (gfloat, dst_rect->width * dst_rect->height * 3);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("Y float"), src_buf,
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("Y float"), src_buf,
GEGL_AUTO_ROWSTRIDE);
offset = ROW + COL;
@@ -167,7 +167,7 @@ demosaic (GeglChantO *op,
offset+=2;
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/demosaic-simple.c b/operations/workshop/demosaic-simple.c
index 539c163..7f32c14 100644
--- a/operations/workshop/demosaic-simple.c
+++ b/operations/workshop/demosaic-simple.c
@@ -47,7 +47,7 @@ demosaic (GeglChantO *op,
src_buf = g_new0 (gfloat, src_rect->width * src_rect->height * 1);
dst_buf = g_new0 (gfloat, dst_rect->width * dst_rect->height * 3);
- gegl_buffer_get (src, 1.0, src_rect, babl_format ("Y float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, src_rect, 1.0, babl_format ("Y float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (y=src_rect->y; y < dst_rect->height + src_rect->y; y++)
@@ -103,7 +103,7 @@ demosaic (GeglChantO *op,
}
}
- gegl_buffer_set (dst, dst_rect, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, dst_rect, 0, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/disc-percentile.c b/operations/workshop/disc-percentile.c
index 2884939..1292263 100644
--- a/operations/workshop/disc-percentile.c
+++ b/operations/workshop/disc-percentile.c
@@ -136,7 +136,7 @@ median (GeglBuffer *src,
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (y=0; y<gegl_buffer_get_height (dst); y++)
@@ -173,7 +173,7 @@ median (GeglBuffer *src,
dst_buf[offset*4+u] = median_pix[u];
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/ditto.c b/operations/workshop/ditto.c
index b7b6cb4..3b2b9cf 100644
--- a/operations/workshop/ditto.c
+++ b/operations/workshop/ditto.c
@@ -48,7 +48,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
@@ -83,7 +84,7 @@ process (GeglOperation *operation,
}
}
- gegl_buffer_set (output, result, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_slice_free1 (result->width * result->height * 4 * sizeof(gfloat), dst_buf);
g_object_unref (sampler);
diff --git a/operations/workshop/emboss.c b/operations/workshop/emboss.c
index 916e469..8ccb674 100644
--- a/operations/workshop/emboss.c
+++ b/operations/workshop/emboss.c
@@ -176,7 +176,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
GeglOperationAreaFilter *op_area = GEGL_OPERATION_AREA_FILTER (operation);
@@ -212,7 +213,7 @@ process (GeglOperation *operation,
src_buf = g_new0 (gfloat, rect.width * rect.height * floats_per_pixel);
dst_buf = g_new0 (gfloat, rect.width * rect.height * floats_per_pixel);
- gegl_buffer_get (input, 1.0, &rect, babl_format (type),
+ gegl_buffer_get (input, &rect, 1.0, babl_format (type),
src_buf, GEGL_AUTO_ROWSTRIDE);
/*do for every row*/
@@ -220,7 +221,7 @@ process (GeglOperation *operation,
emboss (src_buf, &rect, dst_buf, &rect, x, type, floats_per_pixel, alpha,
DEG_TO_RAD (o->azimuth), DEG_TO_RAD (o->elevation), o->depth);
- gegl_buffer_set (output, &rect, babl_format (type),
+ gegl_buffer_set (output, &rect, 0, babl_format (type),
dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
diff --git a/operations/workshop/external/line-profile.c b/operations/workshop/external/line-profile.c
index b477013..9bc7607 100644
--- a/operations/workshop/external/line-profile.c
+++ b/operations/workshop/external/line-profile.c
@@ -48,7 +48,7 @@ buffer_sample (GeglBuffer *buffer,
gfloat rgba[4];
GeglRectangle roi = {x,y,1,1};
- gegl_buffer_get (buffer, 1.0, &roi, babl_format ("RGBA float"), &rgba[0], GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, &roi, 1.0, babl_format ("RGBA float"), &rgba[0], GEGL_AUTO_ROWSTRIDE);
return rgba[component];
}
@@ -132,7 +132,7 @@ process (GeglOperation *operation,
cairo_line_to (cr, o->x1, o->y1);
cairo_stroke (cr);
- gegl_buffer_set (output, NULL, babl_format ("B'aG'aR'aA u8"), buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, NULL, 0, babl_format ("B'aG'aR'aA u8"), buf, GEGL_AUTO_ROWSTRIDE);
}
return TRUE;
diff --git a/operations/workshop/fractal-trace.c b/operations/workshop/fractal-trace.c
index ecff713..5644a6e 100644
--- a/operations/workshop/fractal-trace.c
+++ b/operations/workshop/fractal-trace.c
@@ -234,7 +234,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o;
GeglRectangle boundary;
@@ -270,7 +271,7 @@ process (GeglOperation *operation,
fractaltrace (input, &boundary, dst_buf, result, o, y,
fractal_type, background_type, format);
- gegl_buffer_set (output, result, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (dst_buf);
diff --git a/operations/workshop/generated/average.c b/operations/workshop/generated/average.c
index 4722ce0..7606d28 100644
--- a/operations/workshop/generated/average.c
+++ b/operations/workshop/generated/average.c
@@ -54,7 +54,8 @@ process (GeglOperation *op,
void *aux_buf,
void *out_buf,
glong n_pixels,
- const GeglRectangle *roi)
+ const GeglRectangle *roi,
+ gint level)
{
gfloat *in = in_buf;
gfloat *aux = aux_buf;
diff --git a/operations/workshop/hstack.c b/operations/workshop/hstack.c
index 4cd1a46..96809f1 100644
--- a/operations/workshop/hstack.c
+++ b/operations/workshop/hstack.c
@@ -123,8 +123,8 @@ process (GeglOperation *operation,
gfloat *buf = g_new0 (gfloat, result->width * result->height * 4);
gfloat *bufB = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (temp_in, 1.0, NULL, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (temp_aux, 1.0, NULL, babl_format ("RGBA float"), bufB, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (temp_in, NULL, 1.0, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (temp_aux, NULL, 1.0, babl_format ("RGBA float"), bufB, GEGL_AUTO_ROWSTRIDE);
{
gint offset=0;
gint x,y;
@@ -141,8 +141,8 @@ process (GeglOperation *operation,
offset+=4;
}
}
- gegl_buffer_set (output, NULL, babl_format ("RGBA float"), buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, NULL, 0, babl_format ("RGBA float"), buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (buf);
g_free (bufB);
diff --git a/operations/workshop/kuwahara-max.c b/operations/workshop/kuwahara-max.c
index c12470e..41b15a1 100644
--- a/operations/workshop/kuwahara-max.c
+++ b/operations/workshop/kuwahara-max.c
@@ -96,7 +96,7 @@ kuwahara (GeglBuffer *src,
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@ kuwahara (GeglBuffer *src,
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/kuwahara-min.c b/operations/workshop/kuwahara-min.c
index 116e016..18f4dea 100644
--- a/operations/workshop/kuwahara-min.c
+++ b/operations/workshop/kuwahara-min.c
@@ -96,7 +96,7 @@ kuwahara (GeglBuffer *src,
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@ kuwahara (GeglBuffer *src,
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/kuwahara.c b/operations/workshop/kuwahara.c
index 09ab5a3..2345e56 100644
--- a/operations/workshop/kuwahara.c
+++ b/operations/workshop/kuwahara.c
@@ -96,7 +96,7 @@ kuwahara (GeglBuffer *src,
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@ kuwahara (GeglBuffer *src,
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/lens-distortion.c b/operations/workshop/lens-distortion.c
index 9e8c68e..a2a0c2b 100644
--- a/operations/workshop/lens-distortion.c
+++ b/operations/workshop/lens-distortion.c
@@ -263,7 +263,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
LensDistortion old_lens;
@@ -278,7 +279,7 @@ process (GeglOperation *operation,
lens_setup_calc (o, boundary, &old_lens);
- gegl_buffer_get (input, 1.0, result, babl_format ("RGBA float"),
+ gegl_buffer_get (input, result, 1.0, babl_format ("RGBA float"),
src_buf, GEGL_AUTO_ROWSTRIDE);
for (y = result->y; y < result->y + result->height; y++)
@@ -289,7 +290,7 @@ process (GeglOperation *operation,
}
- gegl_buffer_set (output, result, babl_format ("RGBA float"),
+ gegl_buffer_set (output, result, 0, babl_format ("RGBA float"),
dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (dst_buf);
diff --git a/operations/workshop/mandelbrot.c b/operations/workshop/mandelbrot.c
index 9b012f8..7d8e99d 100644
--- a/operations/workshop/mandelbrot.c
+++ b/operations/workshop/mandelbrot.c
@@ -117,8 +117,8 @@ process (GeglOperation *operation,
}
}
- gegl_buffer_set (output, NULL, babl_format ("Y float"), buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (output, NULL, 0, babl_format ("Y float"), buf,
+ GEGL_AUTO_ROWSTRIDE);
g_free (buf);
return TRUE;
diff --git a/operations/workshop/noise-spread.c b/operations/workshop/noise-spread.c
index e02bda4..516175b 100644
--- a/operations/workshop/noise-spread.c
+++ b/operations/workshop/noise-spread.c
@@ -99,7 +99,7 @@ apply_spread (gint x_amount,
gegl_buffer_sample_cleanup (src);
/* Store dst pixels. */
- gegl_buffer_set (dst, roi, format, dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, roi, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
gegl_buffer_flush(dst);
diff --git a/operations/workshop/plasma.c b/operations/workshop/plasma.c
index cacbdfb..6f9914e 100644
--- a/operations/workshop/plasma.c
+++ b/operations/workshop/plasma.c
@@ -117,7 +117,7 @@ put_pixel (PlasmaContext *context,
rect.width = 1;
rect.height = 1;
- gegl_buffer_set (context->output, &rect, babl_format ("RGBA float"), pixel,
+ gegl_buffer_set (context->output, &rect, 0, babl_format ("RGBA float"), pixel,
GEGL_AUTO_ROWSTRIDE);
return;
}
@@ -160,7 +160,7 @@ do_plasma_big (PlasmaContext *context,
rect.width = x2 - x1 + 1;
rect.height = y2 - y1 + 1;
- gegl_buffer_get (context->output, 1.0, &rect, babl_format ("RGBA float"),
+ gegl_buffer_get (context->output, &rect, 1.0, babl_format ("RGBA float"),
context->buffer, GEGL_AUTO_ROWSTRIDE);
context->using_buffer = TRUE;
@@ -172,7 +172,7 @@ do_plasma_big (PlasmaContext *context,
context->using_buffer = FALSE;
- gegl_buffer_set (context->output, &rect, babl_format ("RGBA float"),
+ gegl_buffer_set (context->output, &rect, 0, babl_format ("RGBA float"),
context->buffer, GEGL_AUTO_ROWSTRIDE);
return ret;
@@ -309,7 +309,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
PlasmaContext *context;
GeglRectangle boundary;
diff --git a/operations/workshop/polar-coordinates.c b/operations/workshop/polar-coordinates.c
index 28ec94b..0913729 100644
--- a/operations/workshop/polar-coordinates.c
+++ b/operations/workshop/polar-coordinates.c
@@ -299,7 +299,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
GeglRectangle boundary = get_effective_area (operation);
@@ -319,7 +320,7 @@ process (GeglOperation *operation,
src_buf = g_new0 (gfloat, result->width * result->height * 4);
dst_buf = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (input, 1.0, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, result, 1.0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
if (o->middle)
{
@@ -352,7 +353,7 @@ process (GeglOperation *operation,
dst_buf[offset++] = dest[i];
}
- gegl_buffer_set (output, result, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
diff --git a/operations/workshop/rawbayer-load.c b/operations/workshop/rawbayer-load.c
index e9b5041..07b542e 100644
--- a/operations/workshop/rawbayer-load.c
+++ b/operations/workshop/rawbayer-load.c
@@ -80,6 +80,7 @@ load_buffer (GeglChantO *op_raw_load)
}
gegl_buffer_set (GEGL_BUFFER (op_raw_load->chant_data),
NULL,
+ 0,
babl_format_new (
babl_model ("RGB"),
babl_type ("u16"),
@@ -88,7 +89,7 @@ load_buffer (GeglChantO *op_raw_load)
babl_component ("B"),
NULL),
buf,
- GEGL_AUTO_ROWSTRIDE, 0);
+ GEGL_AUTO_ROWSTRIDE);
g_free (buf);
}
fclose (pfp);
@@ -112,7 +113,8 @@ static gboolean
process (GeglOperation *operation,
GeglOperationContext *context,
const gchar *output_pad,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
#if 1
diff --git a/operations/workshop/red-eye-removal.c b/operations/workshop/red-eye-removal.c
index 418e7de..1df5a4c 100644
--- a/operations/workshop/red-eye-removal.c
+++ b/operations/workshop/red-eye-removal.c
@@ -90,7 +90,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
const Babl *format = babl_format ("RGBA float");
@@ -100,12 +101,12 @@ process (GeglOperation *operation,
src_buf = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (input, 1.0, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, result, 1.0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < result->width * result->height; x++)
red_eye_reduction (src_buf, 4 * x, (float) o->threshold);
- gegl_buffer_set (output, result, format, src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, format, src_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
diff --git a/operations/workshop/ripple.c b/operations/workshop/ripple.c
index 2370841..af06b7b 100644
--- a/operations/workshop/ripple.c
+++ b/operations/workshop/ripple.c
@@ -75,7 +75,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
@@ -136,7 +137,7 @@ process (GeglOperation *operation,
}
}
- gegl_buffer_set (output, result, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_slice_free1 (result->width * result->height * 4 * sizeof(gfloat), dst_buf);
g_object_unref (sampler);
diff --git a/operations/workshop/snn-percentile.c b/operations/workshop/snn-percentile.c
index 8372340..3ed1629 100644
--- a/operations/workshop/snn-percentile.c
+++ b/operations/workshop/snn-percentile.c
@@ -152,7 +152,7 @@ snn_percentile (GeglBuffer *src,
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, NULL, 1.0, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
percentile/= 100.0;
@@ -212,7 +212,7 @@ snn_percentile (GeglBuffer *src,
}
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, NULL, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
diff --git a/operations/workshop/warp.c b/operations/workshop/warp.c
index 85a1df3..abde861 100644
--- a/operations/workshop/warp.c
+++ b/operations/workshop/warp.c
@@ -218,7 +218,7 @@ stamp (GeglChantO *o,
{
gint pixel_count = 0;
- it = gegl_buffer_iterator_new (priv->buffer, &area, format, GEGL_BUFFER_READ);
+ it = gegl_buffer_iterator_new (priv->buffer, &area, format, GEGL_BUFFER_READ, 0);
while (gegl_buffer_iterator_next (it))
{
@@ -237,7 +237,7 @@ stamp (GeglChantO *o,
y_mean /= pixel_count;
}
- it = gegl_buffer_iterator_new (priv->buffer, &area, format, GEGL_BUFFER_READWRITE);
+ it = gegl_buffer_iterator_new (priv->buffer, &area, format, GEGL_BUFFER_READWRITE, 0);
while (gegl_buffer_iterator_next (it))
{
@@ -307,7 +307,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
WarpPrivate *priv = (WarpPrivate*) o->chant_data;
diff --git a/operations/workshop/waves.c b/operations/workshop/waves.c
index 8712c23..157d89a 100644
--- a/operations/workshop/waves.c
+++ b/operations/workshop/waves.c
@@ -74,7 +74,8 @@ static gboolean
process (GeglOperation *operation,
GeglBuffer *input,
GeglBuffer *output,
- const GeglRectangle *result)
+ const GeglRectangle *result,
+ gint level)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
@@ -136,7 +137,7 @@ process (GeglOperation *operation,
}
}
- gegl_buffer_set (output, result, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, 0, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_slice_free1 (result->width * result->height * 4 * sizeof(gfloat), dst_buf);
g_object_unref (sampler);
diff --git a/operations/workshop/whirl-pinch.c b/operations/workshop/whirl-pinch.c
index a954fc2..19b2cb1 100644
--- a/operations/workshop/whirl-pinch.c
+++ b/operations/workshop/whirl-pinch.c
@@ -163,7 +163,7 @@ apply_whirl_pinch (gdouble whirl, gdouble pinch, gdouble radius,
} /* for */
/* Store dst pixels. */
- gegl_buffer_set (dst, roi, format, dst_buf, GEGL_AUTO_ROWSTRIDE, 0);
+ gegl_buffer_set (dst, roi, 0, format, dst_buf, GEGL_AUTO_ROWSTRIDE);
gegl_buffer_flush(dst);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
