[gegl] Bug 676071 - Make GeglBufferIterator's flags parameter an enum type
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] Bug 676071 - Make GeglBufferIterator's flags parameter an enum type
- Date: Tue, 1 Jul 2014 23:30:40 +0000 (UTC)
commit 5f3bdfc8c4534c21e551fd05dba932ef3f5a4c97
Author: Michael Natterer <mitch gimp org>
Date: Wed Jul 2 01:26:44 2014 +0200
Bug 676071 - Make GeglBufferIterator's flags parameter an enum type
Add enum GeglAccessMode { GEGL_ACCESS_READ, _WRITE, _READWRITE } and
change everything to use it. Add compat #defines for the old values.
examples/sdl-draw.c | 4 +-
gegl/buffer/gegl-buffer-access.c | 6 ++--
gegl/buffer/gegl-buffer-iterator.c | 35 +++++++++++----------
gegl/buffer/gegl-buffer-iterator.h | 22 ++++++------
gegl/gegl-enums.c | 26 +++++++++++++++
gegl/gegl-enums.h | 11 ++++++
gegl/operation/gegl-operation-point-composer.c | 15 +++++---
gegl/operation/gegl-operation-point-composer3.c | 22 ++++++++-----
gegl/operation/gegl-operation-point-filter.c | 10 +++--
gegl/operation/gegl-operation-point-render.c | 3 +-
operations/common/c2g.c | 5 ++-
operations/common/cartoon.c | 4 +-
operations/common/checkerboard.c | 5 ++-
operations/common/color-reduction.c | 4 +-
operations/common/image-compare.c | 10 +++---
operations/common/map-absolute.c | 9 +++--
operations/common/map-relative.c | 9 +++--
operations/common/noise-cell.c | 2 +-
operations/common/noise-pick.c | 2 +-
operations/common/noise-simplex.c | 2 +-
operations/common/noise-slur.c | 2 +-
operations/common/noise-spread.c | 2 +-
operations/common/panorama-projection.c | 3 +-
operations/common/photocopy.c | 10 +++---
operations/common/pixelize.c | 4 +-
operations/common/ripple.c | 2 +-
operations/common/softglow.c | 10 +++---
operations/common/stress.c | 5 ++-
operations/common/stretch-contrast-hsv.c | 6 ++--
operations/common/stretch-contrast.c | 6 ++--
operations/common/tile-seamless.c | 6 ++--
operations/common/warp.c | 6 ++--
operations/common/waves.c | 2 +-
operations/common/wind.c | 4 +-
operations/external/lcms-from-profile.c | 4 +-
operations/transform/transform-core.c | 4 +-
seamless-clone/sc-context.c | 8 ++--
tests/buffer/buffer-test.c | 2 +-
tests/buffer/tests/linear_shift.c | 10 +++---
tests/buffer/tests/test_gegl_buffer_linear_iter.c | 4 +-
tests/buffer/tests/test_gegl_buffer_multcopy.c | 4 +-
tests/simple/test-buffer-changes.c | 8 ++--
42 files changed, 189 insertions(+), 129 deletions(-)
---
diff --git a/examples/sdl-draw.c b/examples/sdl-draw.c
index b16a0a5..846c388 100644
--- a/examples/sdl-draw.c
+++ b/examples/sdl-draw.c
@@ -193,7 +193,7 @@ draw_circle (GeglBuffer *buffer, int x, int y, float r)
iter = gegl_buffer_iterator_new (buffer, &roi, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READWRITE,
+ GEGL_ACCESS_READWRITE,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
@@ -307,4 +307,4 @@ run_main_loop (SDL_Surface *main_window,
break;
}
}
- }
\ No newline at end of file
+ }
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index b14b50a..bd11d66 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -1570,7 +1570,7 @@ gegl_buffer_copy2 (GeglBuffer *src,
dest_rect_r.height = src_rect->height;
i = gegl_buffer_iterator_new (dst, &dest_rect_r, 0, dst->soft_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
GeglRectangle src_rect = i->roi[0];
@@ -1771,7 +1771,7 @@ gegl_buffer_clear2 (GeglBuffer *dst,
* that fully voided tiles are dropped.
*/
i = gegl_buffer_iterator_new (dst, dst_rect, 0, dst->soft_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
memset (((guchar*)(i->data[0])), 0, i->length * pxsize);
@@ -2013,7 +2013,7 @@ gegl_buffer_set_color (GeglBuffer *dst,
* that fully filled tiles are shared.
*/
i = gegl_buffer_iterator_new (dst, dst_rect, 0, dst->soft_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
gegl_memset_pattern (i->data[0], pixel, bpp, i->length);
diff --git a/gegl/buffer/gegl-buffer-iterator.c b/gegl/buffer/gegl-buffer-iterator.c
index 585829a..9f71ae1 100644
--- a/gegl/buffer/gegl-buffer-iterator.c
+++ b/gegl/buffer/gegl-buffer-iterator.c
@@ -55,7 +55,7 @@ typedef enum {
typedef struct _SubIterState {
GeglRectangle full_rect; /* The entire area we are iterating over */
GeglBuffer *buffer;
- unsigned int flags;
+ GeglAccessMode access_mode;
GeglAbyssPolicy abyss_policy;
const Babl *format;
gint format_bpp;
@@ -101,23 +101,24 @@ gegl_buffer_iterator_new (GeglBuffer *buf,
const GeglRectangle *roi,
gint level,
const Babl *format,
- unsigned int flags,
+ GeglAccessMode access_mode,
GeglAbyssPolicy abyss_policy)
{
GeglBufferIterator *iter = gegl_buffer_iterator_empty_new ();
- gegl_buffer_iterator_add (iter, buf, roi, level, format, flags, abyss_policy);
+ gegl_buffer_iterator_add (iter, buf, roi, level, format,
+ access_mode, abyss_policy);
return iter;
}
int
-gegl_buffer_iterator_add (GeglBufferIterator *iter,
+gegl_buffer_iterator_add (GeglBufferIterator *iter,
GeglBuffer *buf,
const GeglRectangle *roi,
gint level,
const Babl *format,
- unsigned int flags,
+ GeglAccessMode access_mode,
GeglAbyssPolicy abyss_policy)
{
GeglBufferIteratorPriv *priv = iter->priv;
@@ -137,13 +138,13 @@ gegl_buffer_iterator_add (GeglBufferIterator *iter,
sub->buffer = buf;
sub->full_rect = *roi;
- sub->flags = flags;
+ sub->access_mode = access_mode;
+ sub->abyss_policy = abyss_policy;
sub->current_tile = NULL;
sub->real_data = NULL;
sub->linear_tile = NULL;
sub->format = format;
sub->format_bpp = babl_format_get_bytes_per_pixel (format);
- sub->abyss_policy = abyss_policy;
if (index > 0)
{
@@ -166,7 +167,7 @@ release_tile (GeglBufferIterator *iter,
if (sub->current_tile_mode == GeglIteratorTileMode_DirectTile)
{
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
gegl_tile_unlock (sub->current_tile);
gegl_tile_unref (sub->current_tile);
@@ -184,7 +185,7 @@ release_tile (GeglBufferIterator *iter,
}
else if (sub->current_tile_mode == GeglIteratorTileMode_GetBuffer)
{
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
{
gegl_buffer_set_unlocked_no_notify (sub->buffer,
&sub->real_roi,
@@ -320,7 +321,7 @@ get_tile (GeglBufferIterator *iter,
sub->current_tile = gegl_buffer_get_tile (buf, tile_x, tile_y, 0);
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
gegl_tile_lock (sub->current_tile);
sub->real_roi.x = (tile_x * tile_width) - shift_x;
@@ -345,7 +346,7 @@ get_indirect (GeglBufferIterator *iter,
sub->real_data = gegl_malloc (sub->format_bpp * sub->real_roi.width * sub->real_roi.height);
- if (sub->flags & GEGL_BUFFER_READ)
+ if (sub->access_mode & GEGL_ACCESS_READ)
{
gegl_buffer_get_unlocked (sub->buffer, 1.0, &sub->real_roi, sub->format, sub->real_data,
GEGL_AUTO_ROWSTRIDE, sub->abyss_policy);
@@ -364,7 +365,7 @@ needs_indirect_read (GeglBufferIterator *iter,
GeglBufferIteratorPriv *priv = iter->priv;
SubIterState *sub = &priv->sub_iter[index];
- if (sub->flags & GEGL_ITERATOR_INCOMPATIBLE)
+ if (sub->access_mode & GEGL_ITERATOR_INCOMPATIBLE)
return TRUE;
/* Needs abyss generation */
@@ -424,7 +425,7 @@ prepare_iteration (GeglBufferIterator *iter)
/* Format converison needed */
if (gegl_buffer_get_format (sub->buffer) != sub->format)
- sub->flags |= GEGL_ITERATOR_INCOMPATIBLE;
+ sub->access_mode |= GEGL_ITERATOR_INCOMPATIBLE;
/* Incompatable tiles */
else if ((priv->origin_tile.width != buf->tile_width) ||
(priv->origin_tile.height != buf->tile_height) ||
@@ -439,11 +440,11 @@ prepare_iteration (GeglBufferIterator *iter)
{
sub->linear_tile = gegl_buffer_get_tile (sub->buffer, 0, 0, 0);
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
gegl_tile_lock (sub->linear_tile);
}
else
- sub->flags |= GEGL_ITERATOR_INCOMPATIBLE;
+ sub->access_mode |= GEGL_ITERATOR_INCOMPATIBLE;
}
gegl_buffer_lock (sub->buffer);
@@ -509,14 +510,14 @@ gegl_buffer_iterator_stop (GeglBufferIterator *iter)
if (sub->linear_tile)
{
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
gegl_tile_unlock (sub->linear_tile);
gegl_tile_unref (sub->linear_tile);
}
gegl_buffer_unlock (sub->buffer);
- if (sub->flags & GEGL_BUFFER_WRITE)
+ if (sub->access_mode & GEGL_ACCESS_WRITE)
gegl_buffer_emit_changed_signal (sub->buffer, &sub->full_rect);
}
diff --git a/gegl/buffer/gegl-buffer-iterator.h b/gegl/buffer/gegl-buffer-iterator.h
index 9954971..2ab1764 100644
--- a/gegl/buffer/gegl-buffer-iterator.h
+++ b/gegl/buffer/gegl-buffer-iterator.h
@@ -24,9 +24,9 @@
#define GEGL_BUFFER_MAX_ITERATORS 6
-#define GEGL_BUFFER_READ 1
-#define GEGL_BUFFER_WRITE 2
-#define GEGL_BUFFER_READWRITE (GEGL_BUFFER_READ|GEGL_BUFFER_WRITE)
+#define GEGL_BUFFER_READ GEGL_ACCESS_READ
+#define GEGL_BUFFER_WRITE GEGL_ACCESS_WRITE
+#define GEGL_BUFFER_READWRITE GEGL_ACCESS_READWRITE
typedef struct _GeglBufferIteratorPriv GeglBufferIteratorPriv;
@@ -62,8 +62,8 @@ GeglBufferIterator *gegl_buffer_iterator_empty_new (void);
* @level: the level at which we are iterating, the roi will indicate the
* extent at 1:1, x,y,width and height are/(2^level)
* @format: the format we want to process this buffers data in, pass 0 to use the buffers format.
- * @flags: whether we need reading or writing to this buffer one of GEGL_BUFFER_READ, GEGL_BUFFER_WRITE and
GEGL_BUFFER_READWRITE.
- * @repeat_mode: how request outside the buffer extent are handled.
+ * @access_mode: whether we need reading or writing to this buffer one of GEGL_BUFFER_READ,
GEGL_BUFFER_WRITE and GEGL_BUFFER_READWRITE.
+ * @abyss_policy: how request outside the buffer extent are handled.
*
* Create a new buffer iterator, this buffer will be iterated through
* in linear chunks, some chunks might be full tiles the coordinates, see
@@ -77,8 +77,8 @@ GeglBufferIterator * gegl_buffer_iterator_new (GeglBuffer *buffer,
const GeglRectangle *roi,
gint level,
const Babl *format,
- guint flags,
- GeglAbyssPolicy repeat_mode);
+ GeglAccessMode access_mode,
+ GeglAbyssPolicy abyss_policy);
/**
@@ -89,8 +89,8 @@ GeglBufferIterator * gegl_buffer_iterator_new (GeglBuffer *buffer,
* @level: the level at which we are iterating, the roi will indicate the
* extent at 1:1, x,y,width and height are/(2^level)
* @format: the format we want to process this buffers data in, pass 0 to use the buffers format.
- * @flags: whether we need reading or writing to this buffer.
- * @repeat_mode: how request outside the buffer extent are handled.
+ * @access_mode: whether we need reading or writing to this buffer.
+ * @abyss_policy: how request outside the buffer extent are handled.
*
* Adds an additional buffer iterator that will be processed in sync with
* the original one, if the buffer doesn't align with the other for tile access
@@ -105,8 +105,8 @@ gint gegl_buffer_iterator_add (GeglBufferIterator *iterator,
const GeglRectangle *roi,
gint level,
const Babl *format,
- guint flags,
- GeglAbyssPolicy repeat_mode);
+ GeglAccessMode access_mode,
+ GeglAbyssPolicy abyss_policy);
/**
* gegl_buffer_iterator_stop: (skip)
diff --git a/gegl/gegl-enums.c b/gegl/gegl-enums.c
index 74d3391..e8980b1 100644
--- a/gegl/gegl-enums.c
+++ b/gegl/gegl-enums.c
@@ -51,6 +51,32 @@ gegl_abyss_policy_get_type (void)
}
GType
+gegl_access_mode_get_type (void)
+{
+ static GType ftype = 0;
+
+ if (ftype == 0)
+ {
+ static GFlagsValue values[] = {
+ { GEGL_ACCESS_READ, N_("Read"), "read" },
+ { GEGL_ACCESS_WRITE, N_("Write"), "write" },
+ { GEGL_ACCESS_READWRITE, N_("Read/Wrrite"), "readwrite" },
+ { 0, NULL, NULL }
+ };
+ gint i;
+
+ for (i = 0; i < G_N_ELEMENTS (values); i++)
+ if (values[i].value_name)
+ values[i].value_name =
+ dgettext (GETTEXT_PACKAGE, values[i].value_name);
+
+ ftype = g_flags_register_static ("GeglAccessMode", values);
+ }
+
+ return ftype;
+}
+
+GType
gegl_orientation_get_type (void)
{
static GType etype = 0;
diff --git a/gegl/gegl-enums.h b/gegl/gegl-enums.h
index 4024bb3..af00843 100644
--- a/gegl/gegl-enums.h
+++ b/gegl/gegl-enums.h
@@ -50,6 +50,17 @@ GType gegl_abyss_policy_get_type (void) G_GNUC_CONST;
typedef enum {
+ GEGL_ACCESS_READ = 1 << 0,
+ GEGL_ACCESS_WRITE = 1 << 1,
+ GEGL_ACCESS_READWRITE = (GEGL_ACCESS_READ | GEGL_ACCESS_WRITE)
+} GeglAccessMode;
+
+GType gegl_access_mode_get_type (void) G_GNUC_CONST;
+
+#define GEGL_TYPE_ACCESS_MODE (gegl_access_mode_get_type ())
+
+
+typedef enum {
GEGL_ORIENTATION_HORIZONTAL,
GEGL_ORIENTATION_VERTICAL
} GeglOrientation;
diff --git a/gegl/operation/gegl-operation-point-composer.c b/gegl/operation/gegl-operation-point-composer.c
index d311507..771537c 100644
--- a/gegl/operation/gegl-operation-point-composer.c
+++ b/gegl/operation/gegl-operation-point-composer.c
@@ -221,7 +221,8 @@ gegl_operation_point_composer_process (GeglOperation *operation,
gint threads = gegl_config ()->threads;
GThreadPool *pool = thread_pool ();
ThreadData thread_data[GEGL_MAX_THREADS];
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint foo = 0, read = 0;
gint in_bpp = input?babl_format_get_bytes_per_pixel (in_format):0;
@@ -235,7 +236,8 @@ gegl_operation_point_composer_process (GeglOperation *operation,
if (input)
{
- read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (in_buf_format != in_format)
@@ -254,7 +256,8 @@ gegl_operation_point_composer_process (GeglOperation *operation,
thread_data[j].input_fish = NULL;
if (aux)
{
- foo = gegl_buffer_iterator_add (i, aux, result, level, aux_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ foo = gegl_buffer_iterator_add (i, aux, result, level, aux_buf_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (aux_buf_format != aux_format)
@@ -334,13 +337,13 @@ gegl_operation_point_composer_process (GeglOperation *operation,
}
else
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint foo = 0, read = 0;
if (input)
- read = gegl_buffer_iterator_add (i, input, result, level, in_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_format, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
if (aux)
- foo = gegl_buffer_iterator_add (i, aux, result, level, aux_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ foo = gegl_buffer_iterator_add (i, aux, result, level, aux_format, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
diff --git a/gegl/operation/gegl-operation-point-composer3.c b/gegl/operation/gegl-operation-point-composer3.c
index 8d96c9b..1ddc5c7 100644
--- a/gegl/operation/gegl-operation-point-composer3.c
+++ b/gegl/operation/gegl-operation-point-composer3.c
@@ -240,7 +240,7 @@ gegl_operation_point_composer3_process (GeglOperation *operation,
gint threads = gegl_config ()->threads;
GThreadPool *pool = thread_pool ();
ThreadData thread_data[GEGL_MAX_THREADS];
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint foo = 0, bar = 0, read = 0;
gint in_bpp = input?babl_format_get_bytes_per_pixel (in_format):0;
@@ -257,7 +257,7 @@ gegl_operation_point_composer3_process (GeglOperation *operation,
if (input)
{
- read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (in_buf_format != in_format)
@@ -276,7 +276,8 @@ gegl_operation_point_composer3_process (GeglOperation *operation,
thread_data[j].input_fish = NULL;
if (aux)
{
- foo = gegl_buffer_iterator_add (i, aux, result, level, aux_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ foo = gegl_buffer_iterator_add (i, aux, result, level, aux_buf_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (aux_buf_format != aux_format)
@@ -297,7 +298,8 @@ gegl_operation_point_composer3_process (GeglOperation *operation,
}
if (aux2)
{
- bar = gegl_buffer_iterator_add (i, aux2, result, level, aux2_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ bar = gegl_buffer_iterator_add (i, aux2, result, level, aux2_buf_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (aux2_buf_format != aux2_format)
@@ -378,15 +380,19 @@ gegl_operation_point_composer3_process (GeglOperation *operation,
}
else
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint foo = 0, bar = 0, read = 0;
if (input)
- read = gegl_buffer_iterator_add (i, input, result, level, in_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
if (aux)
- foo = gegl_buffer_iterator_add (i, aux, result, level, aux_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ foo = gegl_buffer_iterator_add (i, aux, result, level, aux_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
if (aux2)
- bar = gegl_buffer_iterator_add (i, aux2, result, level, aux2_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ bar = gegl_buffer_iterator_add (i, aux2, result, level, aux2_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
diff --git a/gegl/operation/gegl-operation-point-filter.c b/gegl/operation/gegl-operation-point-filter.c
index fee7c91..dad93ac 100644
--- a/gegl/operation/gegl-operation-point-filter.c
+++ b/gegl/operation/gegl-operation-point-filter.c
@@ -198,7 +198,7 @@ gegl_operation_point_filter_process (GeglOperation *operation,
gint threads = gegl_config ()->threads;
GThreadPool *pool = thread_pool ();
ThreadData thread_data[GEGL_MAX_THREADS];
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, output_buf_format,
GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint read = 0;
gint in_bpp = input?babl_format_get_bytes_per_pixel (in_format):0;
@@ -209,7 +209,7 @@ gegl_operation_point_filter_process (GeglOperation *operation,
if (input)
{
- read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_buf_format, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
for (gint j = 0; j < threads; j ++)
{
if (in_buf_format != in_format)
@@ -286,11 +286,13 @@ gegl_operation_point_filter_process (GeglOperation *operation,
}
else
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gint read = 0;
if (input)
- read = gegl_buffer_iterator_add (i, input, result, level, in_format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ read = gegl_buffer_iterator_add (i, input, result, level, in_format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
{
diff --git a/gegl/operation/gegl-operation-point-render.c b/gegl/operation/gegl-operation-point-render.c
index 01c5daa..5225893 100644
--- a/gegl/operation/gegl-operation-point-render.c
+++ b/gegl/operation/gegl-operation-point-render.c
@@ -90,7 +90,8 @@ gegl_operation_point_render_process (GeglOperation *operation,
if ((result->width > 0) && (result->height > 0))
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (output, result, level, out_format,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (i))
point_render_class->process (operation, i->data[0], i->length, &i->roi[0], level);
diff --git a/operations/common/c2g.c b/operations/common/c2g.c
index ceba8b2..9881d6d 100644
--- a/operations/common/c2g.c
+++ b/operations/common/c2g.c
@@ -70,10 +70,11 @@ static void c2g (GeglBuffer *src,
gdouble rgamma)
{
const Babl *format = babl_format ("RGBA float");
-
+
if (dst_rect->width > 0 && dst_rect->height > 0)
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (dst, dst_rect, 0, babl_format("YA float"),
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (dst, dst_rect, 0, babl_format("YA float"),
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
GeglSampler *sampler = gegl_buffer_sampler_new (src, format, GEGL_SAMPLER_NEAREST);
while (gegl_buffer_iterator_next (i))
diff --git a/operations/common/cartoon.c b/operations/common/cartoon.c
index 8ff7428..7f1d25c 100644
--- a/operations/common/cartoon.c
+++ b/operations/common/cartoon.c
@@ -238,9 +238,9 @@ process (GeglOperation *operation,
ramp = compute_ramp (sampler1, sampler2, result, o->pct_black);
iter = gegl_buffer_iterator_new (output, result, 0, babl_format ("Y'CbCrA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, input, result, 0, babl_format ("Y'CbCrA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
diff --git a/operations/common/checkerboard.c b/operations/common/checkerboard.c
index 8dc58de..bd336ce 100644
--- a/operations/common/checkerboard.c
+++ b/operations/common/checkerboard.c
@@ -311,10 +311,11 @@ operation_source_process (GeglOperation *operation,
return TRUE;
}
- iter = gegl_buffer_iterator_new (output, result, level, out_format, GEGL_BUFFER_WRITE,
GEGL_ABYSS_NONE);
+ iter = gegl_buffer_iterator_new (output, result, level, out_format,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
- checkerboard_process (operation, iter->data[0], iter->length, &iter->roi[0], level);
+ checkerboard_process (operation, iter->data[0], iter->length, &iter->roi[0], level);
}
return TRUE;
}
diff --git a/operations/common/color-reduction.c b/operations/common/color-reduction.c
index c04f6ef..9e86239 100644
--- a/operations/common/color-reduction.c
+++ b/operations/common/color-reduction.c
@@ -387,10 +387,10 @@ process_standard (GeglBuffer *input,
generate_channel_masks (channel_bits, channel_mask);
gi = gegl_buffer_iterator_new (input, result, 0, babl_format ("R'G'B'A u16"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (gi, output, result, 0, babl_format ("R'G'B'A u16"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/image-compare.c b/operations/common/image-compare.c
index e18ca09..32d9caa 100644
--- a/operations/common/image-compare.c
+++ b/operations/common/image-compare.c
@@ -93,13 +93,13 @@ process (GeglOperation *operation,
diff_buffer = gegl_buffer_new (result, yadbl);
iter = gegl_buffer_iterator_new (diff_buffer, result, 0, yadbl,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, input, result, 0, cielab,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, aux, result, 0, cielab,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -140,10 +140,10 @@ process (GeglOperation *operation,
}
iter = gegl_buffer_iterator_new (output, result, 0, srgb,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, diff_buffer, result, 0, yadbl,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/operations/common/map-absolute.c b/operations/common/map-absolute.c
index 5da1630..2028d2d 100644
--- a/operations/common/map-absolute.c
+++ b/operations/common/map-absolute.c
@@ -74,11 +74,14 @@ process (GeglOperation *operation,
if (aux != NULL)
{
- it = gegl_buffer_iterator_new (output, result, level, format_io, GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ it = gegl_buffer_iterator_new (output, result, level, format_io,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
index_out = 0;
- index_coords = gegl_buffer_iterator_add (it, aux, result, level, format_coords, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
- index_in = gegl_buffer_iterator_add (it, input, result, level, format_io, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ index_coords = gegl_buffer_iterator_add (it, aux, result, level, format_coords,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+ index_in = gegl_buffer_iterator_add (it, input, result, level, format_io,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (it))
{
diff --git a/operations/common/map-relative.c b/operations/common/map-relative.c
index 04825ec..37cc9fd 100644
--- a/operations/common/map-relative.c
+++ b/operations/common/map-relative.c
@@ -79,11 +79,14 @@ process (GeglOperation *operation,
if (aux != NULL)
{
- it = gegl_buffer_iterator_new (output, result, level, format_io, GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ it = gegl_buffer_iterator_new (output, result, level, format_io,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
index_out = 0;
- index_coords = gegl_buffer_iterator_add (it, aux, result, level, format_coords, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
- index_in = gegl_buffer_iterator_add (it, input, result, level, format_io, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ index_coords = gegl_buffer_iterator_add (it, aux, result, level, format_coords,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+ index_in = gegl_buffer_iterator_add (it, input, result, level, format_io,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (it))
{
diff --git a/operations/common/noise-cell.c b/operations/common/noise-cell.c
index 872734d..ade350a 100644
--- a/operations/common/noise-cell.c
+++ b/operations/common/noise-cell.c
@@ -395,7 +395,7 @@ process (GeglOperation *operation,
}
iter = gegl_buffer_iterator_new (out_buf, roi, level, out_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
c_process (operation, iter->data[0], iter->length, &iter->roi[0], level);
diff --git a/operations/common/noise-pick.c b/operations/common/noise-pick.c
index f727f0a..2ecd643 100644
--- a/operations/common/noise-pick.c
+++ b/operations/common/noise-pick.c
@@ -86,7 +86,7 @@ process (GeglOperation *operation,
bpp = babl_format_get_bytes_per_pixel (format);
gi = gegl_buffer_iterator_new (output, result, 0, format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_CLAMP);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_CLAMP);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/noise-simplex.c b/operations/common/noise-simplex.c
index 5a8afc6..badb31f 100644
--- a/operations/common/noise-simplex.c
+++ b/operations/common/noise-simplex.c
@@ -297,7 +297,7 @@ process (GeglOperation *operation,
}
iter = gegl_buffer_iterator_new (out_buf, roi, level, out_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
c_process (operation, iter->data[0], iter->length, &iter->roi[0], level);
diff --git a/operations/common/noise-slur.c b/operations/common/noise-slur.c
index 6b48725..c9b4816 100644
--- a/operations/common/noise-slur.c
+++ b/operations/common/noise-slur.c
@@ -87,7 +87,7 @@ process (GeglOperation *operation,
bpp = babl_format_get_bytes_per_pixel (format);
gi = gegl_buffer_iterator_new (output, result, 0, format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_CLAMP);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_CLAMP);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/noise-spread.c b/operations/common/noise-spread.c
index 1813c7f..dcea31f 100644
--- a/operations/common/noise-spread.c
+++ b/operations/common/noise-spread.c
@@ -113,7 +113,7 @@ process (GeglOperation *operation,
bpp = babl_format_get_bytes_per_pixel (format);
gi = gegl_buffer_iterator_new (output, result, 0, format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_CLAMP);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_CLAMP);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/panorama-projection.c b/operations/common/panorama-projection.c
index 0b31aaa..9e5f95c 100644
--- a/operations/common/panorama-projection.c
+++ b/operations/common/panorama-projection.c
@@ -376,7 +376,8 @@ process (GeglOperation *operation,
{
float ud = ((1.0/transform.width));
float vd = ((1.0/transform.height));
- it = gegl_buffer_iterator_new (output, result, level, format_io, GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ it = gegl_buffer_iterator_new (output, result, level, format_io,
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
index_out = 0;
while (gegl_buffer_iterator_next (it))
diff --git a/operations/common/photocopy.c b/operations/common/photocopy.c
index 21295d4..5d063cb 100644
--- a/operations/common/photocopy.c
+++ b/operations/common/photocopy.c
@@ -142,11 +142,11 @@ compute_ramp (GeglBuffer *dest1,
iter = gegl_buffer_iterator_new (dest1, roi, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest2, roi, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
memset (hist1, 0, sizeof (int) * 2000);
@@ -251,15 +251,15 @@ process (GeglOperation *operation,
iter = gegl_buffer_iterator_new (dest1, result, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest2, result, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, output, result, 0,
babl_format ("Y float"),
- GEGL_BUFFER_WRITE,
+ GEGL_ACCESS_WRITE,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
diff --git a/operations/common/pixelize.c b/operations/common/pixelize.c
index f28f697..4abda81 100644
--- a/operations/common/pixelize.c
+++ b/operations/common/pixelize.c
@@ -117,7 +117,7 @@ mean_rectangle_noalloc (GeglBuffer *input,
gint c;
gi = gegl_buffer_iterator_new (input, rect, 0, babl_format ("RaGaBaA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_CLAMP);
+ GEGL_ACCESS_READ, GEGL_ABYSS_CLAMP);
while (gegl_buffer_iterator_next (gi))
{
@@ -238,7 +238,7 @@ set_rectangle_noalloc (GeglBuffer *output,
gegl_color_get_pixel (color, babl_format ("RaGaBaA float"), col);
gi = gegl_buffer_iterator_new (output, rect, 0, babl_format ("RaGaBaA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_CLAMP);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_CLAMP);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/ripple.c b/operations/common/ripple.c
index 96b8455..d9b2698 100644
--- a/operations/common/ripple.c
+++ b/operations/common/ripple.c
@@ -99,7 +99,7 @@ process (GeglOperation *operation,
GeglAbyssPolicy abyss = o->tileable ? GEGL_ABYSS_LOOP : GEGL_ABYSS_NONE;
iter = gegl_buffer_iterator_new (output, result, 0, babl_format ("RGBA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/operations/common/softglow.c b/operations/common/softglow.c
index c36cb59..86b571a 100644
--- a/operations/common/softglow.c
+++ b/operations/common/softglow.c
@@ -147,10 +147,10 @@ process (GeglOperation *operation,
dest_tmp = gegl_buffer_new (&working_region, babl_format ("Y' float"));
iter = gegl_buffer_iterator_new (dest_tmp, &working_region, 0, babl_format ("Y' float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, input, &working_region, 0, babl_format ("Y' float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -174,13 +174,13 @@ process (GeglOperation *operation,
dest = grey_blur_buffer (dest_tmp, o->glow_radius, result);
iter = gegl_buffer_iterator_new (output, result, 0, babl_format ("RGBA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, input, result, 0, babl_format ("RGBA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest, result, 0, babl_format ("Y' float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/operations/common/stress.c b/operations/common/stress.c
index 9a03eff..46ed707 100644
--- a/operations/common/stress.c
+++ b/operations/common/stress.c
@@ -74,10 +74,11 @@ static void stress (GeglBuffer *src,
gdouble rgamma)
{
const Babl *format = babl_format ("RGBA float");
-
+
if (dst_rect->width > 0 && dst_rect->height > 0)
{
- GeglBufferIterator *i = gegl_buffer_iterator_new (dst, dst_rect, 0, babl_format("RaGaBaA float"),
GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GeglBufferIterator *i = gegl_buffer_iterator_new (dst, dst_rect, 0, babl_format("RaGaBaA float"),
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
GeglSampler *sampler = gegl_buffer_sampler_new (src, format, GEGL_SAMPLER_NEAREST);
while (gegl_buffer_iterator_next (i))
diff --git a/operations/common/stretch-contrast-hsv.c b/operations/common/stretch-contrast-hsv.c
index 2dcf7a0..b54a404 100644
--- a/operations/common/stretch-contrast-hsv.c
+++ b/operations/common/stretch-contrast-hsv.c
@@ -51,7 +51,7 @@ buffer_get_auto_strech_data (GeglBuffer *buffer,
GeglBufferIterator *gi;
gi = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("HSVA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
@@ -144,10 +144,10 @@ process (GeglOperation *operation,
clean_autostretch_data (&data);
gi = gegl_buffer_iterator_new (input, result, 0, babl_format ("HSVA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (gi, output, result, 0, babl_format ("HSVA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/stretch-contrast.c b/operations/common/stretch-contrast.c
index 627d563..3a9e8e6 100644
--- a/operations/common/stretch-contrast.c
+++ b/operations/common/stretch-contrast.c
@@ -41,7 +41,7 @@ buffer_get_min_max (GeglBuffer *buffer,
GeglBufferIterator *gi;
gint c;
gi = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("R'G'B' float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (c = 0; c < 3; c++)
{
min[c] = G_MAXFLOAT;
@@ -483,10 +483,10 @@ process (GeglOperation *operation,
}
gi = gegl_buffer_iterator_new (input, result, 0, babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (gi, output, result, 0, babl_format ("R'G'B'A float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/tile-seamless.c b/operations/common/tile-seamless.c
index 29a8b85..f258843 100644
--- a/operations/common/tile-seamless.c
+++ b/operations/common/tile-seamless.c
@@ -67,15 +67,15 @@ process (GeglOperation *operation,
gi = gegl_buffer_iterator_new (output, whole_region,
0, babl_format ("R'G'B'A float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
index_iter = gegl_buffer_iterator_add (gi, input, whole_region,
0, babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
index_iter2 = gegl_buffer_iterator_add (gi, input, &shift_region,
0, babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_LOOP);
+ GEGL_ACCESS_READ, GEGL_ABYSS_LOOP);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/common/warp.c b/operations/common/warp.c
index 7a6a621..b5d80aa 100644
--- a/operations/common/warp.c
+++ b/operations/common/warp.c
@@ -243,8 +243,8 @@ stamp (GeglProperties *o,
{
gint pixel_count = 0;
- it = gegl_buffer_iterator_new (priv->buffer, &area, 0, format
- , GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ it = gegl_buffer_iterator_new (priv->buffer, &area, 0, format,
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (it))
{
@@ -264,7 +264,7 @@ stamp (GeglProperties *o,
}
it = gegl_buffer_iterator_new (priv->buffer, &area, 0, format,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (it))
{
diff --git a/operations/common/waves.c b/operations/common/waves.c
index 1e6b75a..65e5d86 100644
--- a/operations/common/waves.c
+++ b/operations/common/waves.c
@@ -117,7 +117,7 @@ process (GeglOperation *operation,
}
iter = gegl_buffer_iterator_new (output, result, 0, babl_format ("RGBA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/operations/common/wind.c b/operations/common/wind.c
index 23774e0..921f713 100644
--- a/operations/common/wind.c
+++ b/operations/common/wind.c
@@ -117,7 +117,7 @@ calculate_bleed (GeglOperation *operation,
&rectA,
0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter,
@@ -125,7 +125,7 @@ calculate_bleed (GeglOperation *operation,
&rectB,
0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
diff --git a/operations/external/lcms-from-profile.c b/operations/external/lcms-from-profile.c
index 90b16b6..0db43f4 100644
--- a/operations/external/lcms-from-profile.c
+++ b/operations/external/lcms-from-profile.c
@@ -179,10 +179,10 @@ process (GeglOperation *operation,
GeglBufferIterator *gi;
gi = gegl_buffer_iterator_new (input, result, 0, in_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (gi, output, result, 0, out_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/operations/transform/transform-core.c b/operations/transform/transform-core.c
index 48887ce..84aeac0 100644
--- a/operations/transform/transform-core.c
+++ b/operations/transform/transform-core.c
@@ -778,7 +778,7 @@ transform_affine (GeglOperation *operation,
dest_extent,
level,
format,
- GEGL_BUFFER_WRITE,
+ GEGL_ACCESS_WRITE,
GEGL_ABYSS_NONE);
/*
@@ -974,7 +974,7 @@ transform_generic (GeglOperation *operation,
dest_extent,
level,
format,
- GEGL_BUFFER_WRITE,
+ GEGL_ACCESS_WRITE,
GEGL_ABYSS_NONE);
gegl_matrix3_copy_into (&inverse, matrix);
diff --git a/seamless-clone/sc-context.c b/seamless-clone/sc-context.c
index 0e88fc7..383fb0d 100644
--- a/seamless-clone/sc-context.c
+++ b/seamless-clone/sc-context.c
@@ -545,7 +545,7 @@ gegl_sc_compute_uvt_cache (P2trMesh *mesh,
uvt = gegl_buffer_new (area, GEGL_SC_BABL_UVT_FORMAT);
iter = gegl_buffer_iterator_new (uvt, area, 0, GEGL_SC_BABL_UVT_FORMAT,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
config.step_x = config.step_y = 1;
config.cpp = GEGL_SC_COLOR_CHANNEL_COUNT; /* Not that it will be used, but it won't harm */
@@ -651,7 +651,7 @@ gegl_sc_context_render (GeglScContext *context,
&to_render,
0,
format,
- GEGL_BUFFER_WRITE,
+ GEGL_ACCESS_WRITE,
GEGL_ABYSS_NONE);
out_index = 0;
@@ -666,7 +666,7 @@ gegl_sc_context_render (GeglScContext *context,
&to_render_fg,
0,
GEGL_SC_BABL_UVT_FORMAT,
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
}
else
@@ -679,7 +679,7 @@ gegl_sc_context_render (GeglScContext *context,
&to_render_fg,
0,
format,
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
diff --git a/tests/buffer/buffer-test.c b/tests/buffer/buffer-test.c
index 9fa1407..7ad4c7e 100644
--- a/tests/buffer/buffer-test.c
+++ b/tests/buffer/buffer-test.c
@@ -293,7 +293,7 @@ static void fill_rect (GeglBuffer *buffer,
{
GeglBufferIterator *gi;
gi = gegl_buffer_iterator_new (buffer, roi, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
gfloat *buf = gi->data[0];
diff --git a/tests/buffer/tests/linear_shift.c b/tests/buffer/tests/linear_shift.c
index f988113..1962014 100644
--- a/tests/buffer/tests/linear_shift.c
+++ b/tests/buffer/tests/linear_shift.c
@@ -48,19 +48,19 @@ TEST ()
out = gegl_buffer_new (&out_extent, babl_format ("Y float"));
iter = gegl_buffer_iterator_new (out, &out_extent, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, linear_a, &out_extent, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_BLACK);
+ GEGL_ACCESS_READ, GEGL_ABYSS_BLACK);
gegl_buffer_iterator_add (iter, linear_b, &out_extent, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_BLACK);
+ GEGL_ACCESS_READ, GEGL_ABYSS_BLACK);
gegl_buffer_iterator_add (iter, linear_c, &out_extent, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_BLACK);
+ GEGL_ACCESS_READ, GEGL_ABYSS_BLACK);
gegl_buffer_iterator_add (iter, linear_d, &out_extent, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_BLACK);
+ GEGL_ACCESS_READ, GEGL_ABYSS_BLACK);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/tests/buffer/tests/test_gegl_buffer_linear_iter.c
b/tests/buffer/tests/test_gegl_buffer_linear_iter.c
index e90419d..bd2a2be 100644
--- a/tests/buffer/tests/test_gegl_buffer_linear_iter.c
+++ b/tests/buffer/tests/test_gegl_buffer_linear_iter.c
@@ -22,10 +22,10 @@ TEST ()
fill (buffer2, 1.0);
iter = gegl_buffer_iterator_new (buffer2, &source, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, buffer, &source, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/tests/buffer/tests/test_gegl_buffer_multcopy.c b/tests/buffer/tests/test_gegl_buffer_multcopy.c
index 5d8e65e..3b5bdfb 100644
--- a/tests/buffer/tests/test_gegl_buffer_multcopy.c
+++ b/tests/buffer/tests/test_gegl_buffer_multcopy.c
@@ -27,10 +27,10 @@ TEST ()
fill (buffer2, 1.0);
iter = gegl_buffer_iterator_new (buffer2, &source, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, buffer, &source, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/tests/simple/test-buffer-changes.c b/tests/simple/test-buffer-changes.c
index 2684f12..47379f0 100644
--- a/tests/simple/test-buffer-changes.c
+++ b/tests/simple/test-buffer-changes.c
@@ -95,7 +95,7 @@ test_buffer_change_signal_on_set(void)
/* Utility function to test emission of 'changed' signal on GeglBuffer
* when accessing with GeglBufferIterator.
- * @access_method: GEGL_BUFFER_READ, GEGL_BUFFER_WRITE, GEGL_BUFFER_READWRITE
+ * @access_method: GEGL_ACCESS_READ, GEGL_ACCESS_WRITE, GEGL_ACCESS_READWRITE
* @expected_signal_calls: Whether the 'changed' signal is expected to be emitted or not
*/
void
@@ -126,21 +126,21 @@ test_buffer_change_signal_with_iter(guint access_method, guint expected_signal_c
void
test_buffer_change_signal_with_iter_write(void)
{
- test_buffer_change_signal_with_iter(GEGL_BUFFER_WRITE, 1);
+ test_buffer_change_signal_with_iter(GEGL_ACCESS_WRITE, 1);
}
/* Test that 'changed' signal is emitted once for gegl_buffer_iterator in READWRITE mode */
void
test_buffer_change_signal_with_iter_readwrite(void)
{
- test_buffer_change_signal_with_iter(GEGL_BUFFER_READWRITE, 1);
+ test_buffer_change_signal_with_iter(GEGL_ACCESS_READWRITE, 1);
}
/* Test that 'changed' signal is _not_ emitted on gegl_buffer_iterator in READ mode */
void
test_buffer_no_change_signal_with_iter_read(void)
{
- test_buffer_change_signal_with_iter(GEGL_BUFFER_READ, 0);
+ test_buffer_change_signal_with_iter(GEGL_ACCESS_READ, 0);
}
gint
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
