[gimp] Use the new GeglAccessMode enum instead of the old values
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Use the new GeglAccessMode enum instead of the old values
- Date: Wed, 2 Jul 2014 00:04:00 +0000 (UTC)
commit b5530e9e3d0a56751d58cf137b95042ce287b4ad
Author: Michael Natterer <mitch gimp org>
Date: Wed Jul 2 02:00:35 2014 +0200
Use the new GeglAccessMode enum instead of the old values
app/core/gimpdrawable-blend.c | 2 +-
app/core/gimphistogram.c | 4 +-
app/core/gimpimage-convert-type.c | 26 ++++++++++----------
app/core/gimppalette-import.c | 4 +-
app/core/gimppickable-contiguous-region.c | 4 +-
app/core/gimpscanconvert.c | 2 +-
app/gegl/gimp-gegl-loops.c | 34 +++++++++++++-------------
app/gegl/gimp-gegl-mask-combine.c | 6 ++--
app/gegl/gimp-gegl-mask.c | 4 +-
app/operations/gimpoperationcagecoefcalc.c | 2 +-
app/operations/gimpoperationcagetransform.c | 2 +-
app/operations/gimpoperationshapeburst.c | 2 +-
app/paint/gimpbrushcore.c | 2 +-
app/paint/gimpheal.c | 12 ++++----
app/paint/gimpink.c | 2 +-
app/paint/gimppaintcore-loops.c | 27 +++++++++++----------
modules/display-filter-color-blind.c | 2 +-
modules/display-filter-gamma.c | 2 +-
modules/display-filter-high-contrast.c | 2 +-
modules/display-filter-lcms.c | 2 +-
modules/display-filter-proof.c | 2 +-
plug-ins/common/border-average.c | 2 +-
plug-ins/common/colormap-remap.c | 4 +-
plug-ins/common/compose.c | 6 ++--
plug-ins/common/decompose.c | 6 ++--
plug-ins/common/file-png.c | 6 ++--
plug-ins/common/file-tiff-load.c | 8 +++---
plug-ins/common/gradient-map.c | 4 +-
plug-ins/common/lcms.c | 4 +-
plug-ins/common/screenshot.c | 2 +-
plug-ins/file-psd/psd-save.c | 3 +-
plug-ins/ifs-compose/ifs-compose.c | 2 +-
plug-ins/print/print-draw-page.c | 2 +-
33 files changed, 98 insertions(+), 96 deletions(-)
---
diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
index 5c9fa91..5a92151 100644
--- a/app/core/gimpdrawable-blend.c
+++ b/app/core/gimpdrawable-blend.c
@@ -912,7 +912,7 @@ gradient_fill_region (GimpImage *image,
iter = gegl_buffer_iterator_new (buffer, buffer_region, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
if (dither)
diff --git a/app/core/gimphistogram.c b/app/core/gimphistogram.c
index 5143e0e..3d9252c 100644
--- a/app/core/gimphistogram.c
+++ b/app/core/gimphistogram.c
@@ -317,12 +317,12 @@ gimp_histogram_calculate (GimpHistogram *histogram,
gimp_histogram_alloc_values (histogram, n_components, n_bins);
iter = gegl_buffer_iterator_new (buffer, buffer_rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
if (mask)
gegl_buffer_iterator_add (iter, mask, mask_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
#define VALUE(c,i) (priv->values[(c) * priv->n_bins + \
(gint) (CLAMP ((i), 0.0, 1.0) * \
diff --git a/app/core/gimpimage-convert-type.c b/app/core/gimpimage-convert-type.c
index d73caf9..eaa7fcb 100644
--- a/app/core/gimpimage-convert-type.c
+++ b/app/core/gimpimage-convert-type.c
@@ -687,7 +687,7 @@ remap_indexed_layer (GimpLayer *layer,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -1150,7 +1150,7 @@ generate_histogram_gray (CFHistogram histogram,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -1219,7 +1219,7 @@ generate_histogram_rgb (CFHistogram histogram,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
if (progress)
@@ -2858,12 +2858,12 @@ median_cut_pass2_no_dither_gray (QuantizeObj *quantobj,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, new_buffer,
NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -2964,12 +2964,12 @@ median_cut_pass2_fixed_dither_gray (QuantizeObj *quantobj,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, new_buffer,
NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -3141,12 +3141,12 @@ median_cut_pass2_no_dither_rgb (QuantizeObj *quantobj,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, new_buffer,
NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
layer_size = (gimp_item_get_width (GIMP_ITEM (layer)) *
gimp_item_get_height (GIMP_ITEM (layer)));
@@ -3274,12 +3274,12 @@ median_cut_pass2_fixed_dither_rgb (QuantizeObj *quantobj,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, new_buffer,
NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
layer_size = (gimp_item_get_width (GIMP_ITEM (layer)) *
gimp_item_get_height (GIMP_ITEM (layer)));
@@ -3485,12 +3485,12 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
iter = gegl_buffer_iterator_new (gimp_drawable_get_buffer (GIMP_DRAWABLE (layer)),
NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, new_buffer,
NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index 0068d25..df98347 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -290,7 +290,7 @@ gimp_palette_import_extract (GimpImage *image,
format = babl_format ("R'G'B'A u8");
iter = gegl_buffer_iterator_new (buffer, &rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
bpp = babl_format_get_bytes_per_pixel (format);
if (selection_only &&
@@ -305,7 +305,7 @@ gimp_palette_import_extract (GimpImage *image,
format = babl_format ("Y u8");
gegl_buffer_iterator_add (iter, buffer, &rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
mask_roi = &iter->roi[1];
mask_bpp = babl_format_get_bytes_per_pixel (format);
}
diff --git a/app/core/gimppickable-contiguous-region.c b/app/core/gimppickable-contiguous-region.c
index 41b78b9..446596f 100644
--- a/app/core/gimppickable-contiguous-region.c
+++ b/app/core/gimppickable-contiguous-region.c
@@ -195,11 +195,11 @@ gimp_pickable_contiguous_region_by_color (GimpPickable *pickable,
iter = gegl_buffer_iterator_new (src_buffer,
NULL, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, mask_buffer,
NULL, 0, babl_format ("Y float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c
index 0c7df76..f37bd0c 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, 0, format,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/app/gegl/gimp-gegl-loops.c b/app/gegl/gimp-gegl-loops.c
index 141e1da..07b96fe 100644
--- a/app/gegl/gimp-gegl-loops.c
+++ b/app/gegl/gimp-gegl-loops.c
@@ -75,11 +75,11 @@ gimp_gegl_convolve (GeglBuffer *src_buffer,
dest_components = babl_format_get_n_components (dest_format);
iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0, src_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, dest_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
dest_roi = &iter->roi[1];
while (gegl_buffer_iterator_next (iter))
@@ -220,11 +220,11 @@ gimp_gegl_dodgeburn (GeglBuffer *src_buffer,
iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
switch (mode)
{
@@ -345,15 +345,15 @@ gimp_gegl_smudge_blend (GeglBuffer *top_buffer,
iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -403,11 +403,11 @@ gimp_gegl_apply_mask (GeglBuffer *mask_buffer,
iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -436,11 +436,11 @@ gimp_gegl_combine_mask (GeglBuffer *mask_buffer,
iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -470,11 +470,11 @@ gimp_gegl_combine_mask_weird (GeglBuffer *mask_buffer,
iter = gegl_buffer_iterator_new (mask_buffer, mask_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -522,19 +522,19 @@ gimp_gegl_replace (GeglBuffer *top_buffer,
iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, mask_buffer, mask_rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 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/app/gegl/gimp-gegl-mask-combine.c b/app/gegl/gimp-gegl-mask-combine.c
index eda343e..ec8f179 100644
--- a/app/gegl/gimp-gegl-mask-combine.c
+++ b/app/gegl/gimp-gegl-mask-combine.c
@@ -204,7 +204,7 @@ gimp_gegl_mask_combine_ellipse_rect (GeglBuffer *mask,
iter = gegl_buffer_iterator_new (mask,
GEGL_RECTANGLE (x0, y0, width, height), 0,
babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
@@ -397,14 +397,14 @@ gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
iter = gegl_buffer_iterator_new (mask, &rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
rect.x -= off_x;
rect.y -= off_y;
gegl_buffer_iterator_add (iter, add_on, &rect, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
switch (op)
{
diff --git a/app/gegl/gimp-gegl-mask.c b/app/gegl/gimp-gegl-mask.c
index 691537b..368b979 100644
--- a/app/gegl/gimp-gegl-mask.c
+++ b/app/gegl/gimp-gegl-mask.c
@@ -48,7 +48,7 @@ gimp_gegl_mask_bounds (GeglBuffer *buffer,
ty2 = 0;
iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
@@ -138,7 +138,7 @@ gimp_gegl_mask_is_empty (GeglBuffer *buffer)
g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
iter = gegl_buffer_iterator_new (buffer, NULL, 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/app/operations/gimpoperationcagecoefcalc.c b/app/operations/gimpoperationcagecoefcalc.c
index 33fd842..af7ec32 100644
--- a/app/operations/gimpoperationcagecoefcalc.c
+++ b/app/operations/gimpoperationcagecoefcalc.c
@@ -216,7 +216,7 @@ gimp_operation_cage_coef_calc_process (GeglOperation *operation,
n_cage_vertices = gimp_cage_config_get_n_points (config);
it = gegl_buffer_iterator_new (output, roi, 0, format,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (it))
{
diff --git a/app/operations/gimpoperationcagetransform.c b/app/operations/gimpoperationcagetransform.c
index 3f419c7..858a2bd 100644
--- a/app/operations/gimpoperationcagetransform.c
+++ b/app/operations/gimpoperationcagetransform.c
@@ -245,7 +245,7 @@ gimp_operation_cage_transform_process (GeglOperation *operation,
/* pre-fill the out buffer with no-displacement coordinate */
it = gegl_buffer_iterator_new (out_buf, roi, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
cage_bb = gimp_cage_config_get_bounding_box (config);
point = &(g_array_index (config->cage_points, GimpCagePoint, 0));
diff --git a/app/operations/gimpoperationshapeburst.c b/app/operations/gimpoperationshapeburst.c
index 71be013..6c73bab 100644
--- a/app/operations/gimpoperationshapeburst.c
+++ b/app/operations/gimpoperationshapeburst.c
@@ -322,7 +322,7 @@ gimp_operation_shapeburst_process (GeglOperation *operation,
GeglBufferIterator *iter;
iter = gegl_buffer_iterator_new (output, NULL, 0, NULL,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index b6755da..ddf1afb 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -1597,7 +1597,7 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore *core,
iter = gegl_buffer_iterator_new (area, NULL, 0,
babl_format ("RGBA float"),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
index a06ccac..7130603 100644
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@@ -170,14 +170,14 @@ gimp_heal_sub (GeglBuffer *top_buffer,
g_return_if_reached ();
iter = gegl_buffer_iterator_new (top_buffer, top_rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, bottom_buffer, bottom_rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, result_buffer, result_rect, 0,
babl_format_n (babl_type ("float"), n_components),
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -215,13 +215,13 @@ gimp_heal_add (GeglBuffer *first_buffer,
iter = gegl_buffer_iterator_new (first_buffer, first_rect, 0,
babl_format_n (babl_type ("float"),
n_components),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, second_buffer, second_rect, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, result_buffer, result_rect, 0, format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index ddcb86a..dffbc5c 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -659,7 +659,7 @@ render_blob (GeglBuffer *buffer,
GeglRectangle *roi;
iter = gegl_buffer_iterator_new (buffer, rect, 0, babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/app/paint/gimppaintcore-loops.c b/app/paint/gimppaintcore-loops.c
index a270e52..a9c0dcb 100644
--- a/app/paint/gimppaintcore-loops.c
+++ b/app/paint/gimppaintcore-loops.c
@@ -50,7 +50,7 @@ combine_paint_mask_to_canvas_mask (const GimpTempBuf *paint_mask,
iter = gegl_buffer_iterator_new (canvas_buffer, &roi, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
if (stipple)
{
@@ -190,7 +190,8 @@ canvas_buffer_to_paint_buf_alpha (GimpTempBuf *paint_buf,
iter = gegl_buffer_iterator_new (canvas_buffer, &roi, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
+
while (gegl_buffer_iterator_next (iter))
{
gfloat *canvas_pixel = (gfloat *)iter->data[0];
@@ -316,20 +317,20 @@ do_layer_blend (GeglBuffer *src_buffer,
iter = gegl_buffer_iterator_new (dst_buffer, &roi, 0,
iterator_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, src_buffer, &roi, 0,
iterator_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
if (mask_buffer)
{
gegl_buffer_iterator_add (iter, mask_buffer, &mask_roi, 0,
babl_format ("Y float"),
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
}
- while (gegl_buffer_iterator_next(iter))
+ while (gegl_buffer_iterator_next (iter))
{
gfloat *out_pixel = (gfloat *)iter->data[0];
gfloat *in_pixel = (gfloat *)iter->data[1];
@@ -384,22 +385,22 @@ mask_components_onto (GeglBuffer *src_buffer,
iter = gegl_buffer_iterator_new (dst_buffer, roi, 0,
iterator_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, src_buffer, roi, 0,
iterator_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, aux_buffer, roi, 0,
iterator_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next(iter))
{
- gfloat *dest = (gfloat *)iter->data[0];
- gfloat *src = (gfloat *)iter->data[1];
- gfloat *aux = (gfloat *)iter->data[2];
- glong samples = iter->length;
+ gfloat *dest = (gfloat *)iter->data[0];
+ gfloat *src = (gfloat *)iter->data[1];
+ gfloat *aux = (gfloat *)iter->data[2];
+ glong samples = iter->length;
while (samples--)
{
diff --git a/modules/display-filter-color-blind.c b/modules/display-filter-color-blind.c
index 91b25c7..021fdc7 100644
--- a/modules/display-filter-color-blind.c
+++ b/modules/display-filter-color-blind.c
@@ -329,7 +329,7 @@ cdisplay_colorblind_convert_buffer (GimpColorDisplay *display,
iter = gegl_buffer_iterator_new (buffer, area, 0,
babl_format ("RGBA float") /* linear! */,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/modules/display-filter-gamma.c b/modules/display-filter-gamma.c
index df5ac44..a82dc72 100644
--- a/modules/display-filter-gamma.c
+++ b/modules/display-filter-gamma.c
@@ -193,7 +193,7 @@ cdisplay_gamma_convert_buffer (GimpColorDisplay *display,
iter = gegl_buffer_iterator_new (buffer, area, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/modules/display-filter-high-contrast.c b/modules/display-filter-high-contrast.c
index 0f7da7b..55f0128 100644
--- a/modules/display-filter-high-contrast.c
+++ b/modules/display-filter-high-contrast.c
@@ -193,7 +193,7 @@ cdisplay_contrast_convert_buffer (GimpColorDisplay *display,
iter = gegl_buffer_iterator_new (buffer, area, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
index 5e16b03..c03e7cd 100644
--- a/modules/display-filter-lcms.c
+++ b/modules/display-filter-lcms.c
@@ -259,7 +259,7 @@ cdisplay_lcms_convert_buffer (GimpColorDisplay *display,
iter = gegl_buffer_iterator_new (buffer, area, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index 206b728..cfb894c 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -247,7 +247,7 @@ cdisplay_proof_convert_buffer (GimpColorDisplay *display,
iter = gegl_buffer_iterator_new (buffer, area, 0,
babl_format ("R'G'B'A float"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
index ec8a658..c8b816b 100644
--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@@ -274,7 +274,7 @@ borderaverage (GeglBuffer *buffer,
GeglBufferIterator *gi;
gi = gegl_buffer_iterator_new (buffer, &border[i], 0, babl_format ("R'G'B' u8"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 746e0d6..916e13e 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -363,13 +363,13 @@ remap (gint32 image_ID,
iter = gegl_buffer_iterator_new (buffer,
GEGL_RECTANGLE (0, 0, width, height), 0,
format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
src_roi = &iter->roi[0];
gegl_buffer_iterator_add (iter, shadow,
GEGL_RECTANGLE (0, 0, width, height), 0,
format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
dest_roi = &iter->roi[1];
while (gegl_buffer_iterator_next (iter))
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 1c16194..41974e1 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -648,7 +648,7 @@ cpn_affine_transform (GeglBuffer *buffer,
gegl_buffer_set_format (buffer, babl_format ("Y double"));
gi = gegl_buffer_iterator_new (buffer, NULL, 0, NULL,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
@@ -675,13 +675,13 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES],
gint j;
gi = gegl_buffer_iterator_new (dst, NULL, 0, NULL,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
for (j = 0; j < num_cpn; j++)
{
if (inputs[j].is_ID)
gegl_buffer_iterator_add (gi, temp[j], NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
}
while (gegl_buffer_iterator_next (gi))
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index af8bf39..b332537 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -632,12 +632,12 @@ transfer_registration_color (GeglBuffer *src,
dst_bpp = babl_format_get_bytes_per_pixel (dst_format);
gi = gegl_buffer_iterator_new (src, NULL, 0, NULL,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
for (i = 0; i < count; i++)
{
gegl_buffer_iterator_add (gi, dst[i], NULL, 0, NULL,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
}
while (gegl_buffer_iterator_next (gi))
@@ -683,7 +683,7 @@ cpn_affine_transform_clamp (GeglBuffer *buffer,
gegl_buffer_set_format (buffer, babl_format ("Y double"));
gi = gegl_buffer_iterator_new (buffer, NULL, 0, NULL,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 82637aa..876de60 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -1312,7 +1312,7 @@ load_image (const gchar *filename,
file_format = gegl_buffer_get_format (buffer);
iter = gegl_buffer_iterator_new (buffer, NULL, 0, file_format,
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
n_components = babl_format_get_n_components (file_format);
g_warn_if_fail (n_components == 2);
@@ -1937,7 +1937,7 @@ ia_has_transparent_pixels (GeglBuffer *buffer)
format = gegl_buffer_get_format (buffer);
iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
n_components = babl_format_get_n_components (format);
g_return_val_if_fail (n_components == 2, FALSE);
@@ -1980,7 +1980,7 @@ find_unused_ia_color (GeglBuffer *buffer,
format = gegl_buffer_get_format (buffer);
iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
n_components = babl_format_get_n_components (format);
g_return_val_if_fail (n_components == 2, FALSE);
diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c
index a26978a..e45c574 100644
--- a/plug-ins/common/file-tiff-load.c
+++ b/plug-ins/common/file-tiff-load.c
@@ -1538,12 +1538,12 @@ load_contiguous (TIFF *tif,
iter = gegl_buffer_iterator_new (src_buf,
GEGL_RECTANGLE (0, 0, cols, rows),
0, NULL,
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, channel[i].buffer,
GEGL_RECTANGLE (x, y, cols, rows),
0, channel[i].format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
@@ -1664,12 +1664,12 @@ load_separate (TIFF *tif,
iter = gegl_buffer_iterator_new (src_buf,
GEGL_RECTANGLE (0, 0, cols, rows),
0, NULL,
- GEGL_BUFFER_READ,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, channel[i].buffer,
GEGL_RECTANGLE (x, y, cols, rows),
0, channel[i].format,
- GEGL_BUFFER_READWRITE,
+ GEGL_ACCESS_READWRITE,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c
index 7acfafd..3e13582 100644
--- a/plug-ins/common/gradient-map.c
+++ b/plug-ins/common/gradient-map.c
@@ -265,11 +265,11 @@ map (GeglBuffer *buffer,
}
gi = gegl_buffer_iterator_new (shadow_buffer, NULL, 0, format_shadow,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
index_iter = gegl_buffer_iterator_add (gi, buffer, NULL,
0, format_buffer,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (gi))
{
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 2e025d5..9182aa2 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -1022,11 +1022,11 @@ lcms_layers_transform_rgb (gint *layers,
iter = gegl_buffer_iterator_new (src_buffer, NULL, 0,
iter_format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
gegl_buffer_iterator_add (iter, dest_buffer, NULL, 0,
iter_format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index 7d96338..8213852 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -896,7 +896,7 @@ add_cursor_image (gint32 image,
gimp_drawable_width (layer),
gimp_drawable_height (layer)),
0, babl_format ("R'G'B'A u8"),
- GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c
index 709ecde..239b8a1 100644
--- a/plug-ins/file-psd/psd-save.c
+++ b/plug-ins/file-psd/psd-save.c
@@ -1523,7 +1523,8 @@ create_merged_image (gint32 image_id)
gint width = gegl_buffer_get_width (buffer);
gint height = gegl_buffer_get_height (buffer);
GeglBufferIterator *iter = gegl_buffer_iterator_new (buffer, GEGL_RECTANGLE (0, 0,
width, height),
- 0, format, GEGL_BUFFER_READ,
GEGL_ABYSS_NONE);
+ 0, format,
+ GEGL_ACCESS_READ,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index cf9e102..c5547bc 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1313,7 +1313,7 @@ ifs_compose (gint32 drawable_id)
GEGL_RECTANGLE (0, band_y,
width, band_height), 0,
format,
- GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE);
roi = &iter->roi[0];
while (gegl_buffer_iterator_next (iter))
diff --git a/plug-ins/print/print-draw-page.c b/plug-ins/print/print-draw-page.c
index 2a0542f..84b491b 100644
--- a/plug-ins/print/print-draw-page.c
+++ b/plug-ins/print/print-draw-page.c
@@ -135,7 +135,7 @@ print_surface_from_drawable (gint32 drawable_ID,
iter = gegl_buffer_iterator_new (buffer,
GEGL_RECTANGLE (0, 0, width, height), 0,
format,
- GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
+ GEGL_ACCESS_READ, GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
