Commit cc7028d8 authored by Øyvind "pippin" Kolås's avatar Øyvind "pippin" Kolås

buffer: move definitions of GeglRectangle and buffer enums to buffer

This reverts earlier indentation breaking changes when GeglRectangle was
renamed GeglBufferRectangle this change also retains the existing released API
and ABI more exactly.
parent e98f33c3
......@@ -62,9 +62,11 @@ GEGL_introspectable_headers = \
buffer/gegl-buffer-iterator.h \
buffer/gegl-buffer-iterator2.h \
buffer/gegl-buffer-backend.h \
buffer/gegl-rectangle.h \
buffer/gegl-tile-backend.h \
buffer/gegl-tile-handler.h \
buffer/gegl-tile-source.h \
buffer/gegl-buffer-enums.h \
graph/gegl-node.h \
process/gegl-graph-debug.h \
process/gegl-processor.h \
......
......@@ -29,12 +29,15 @@ libbuffer_la_SOURCES = \
gegl-buffer-access.c \
gegl-buffer-config.c \
gegl-buffer-config.h \
gegl-buffer-enums.c \
gegl-buffer-enums.h \
gegl-buffer-matrix2.c \
gegl-buffer-matrix2.h \
gegl-buffer-index.h \
gegl-buffer-iterator.c \
gegl-buffer-iterator2.c \
gegl-buffer-linear.c \
gegl-rectangle.c \
gegl-buffer-load.c \
gegl-buffer-save.c \
gegl-sampler.c \
......@@ -64,6 +67,7 @@ libbuffer_la_SOURCES = \
gegl-buffer-iterator.h \
gegl-buffer-iterator2.h \
gegl-buffer-iterator-private.h \
gegl-rectangle.h \
gegl-buffer-types.h \
gegl-buffer-formats.h \
gegl-sampler.h \
......
......@@ -26,9 +26,7 @@
#include <babl/babl.h>
#include "gegl-buffer.h"
#include "gegl-types.h"
#include "gegl-buffer-formats.h"
#include "gegl-utils.h"
#include "gegl-algorithms.h"
#include <math.h>
......@@ -153,8 +151,8 @@ static inline int int_floorf (float x)
static void
gegl_boxfilter_u8_nl (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
const gint s_rowstride,
const gdouble scale,
const gint bpp,
......@@ -326,8 +324,8 @@ gegl_boxfilter_u8_nl (guchar *dest_buf,
static void
gegl_boxfilter_u8_nl_alpha (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
const gint s_rowstride,
const gdouble scale,
const gint bpp,
......@@ -459,8 +457,8 @@ gegl_boxfilter_u8_nl_alpha (guchar *dest_buf,
static void
gegl_bilinear_u8_nl (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
const gint s_rowstride,
const gdouble scale,
const gint components,
......@@ -587,8 +585,8 @@ gegl_bilinear_u8_nl (guchar *dest_buf,
static void
gegl_bilinear_u8_nl_alpha (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
const gint s_rowstride,
const gdouble scale,
const gint components,
......@@ -995,8 +993,8 @@ gegl_downscale_2x2_nearest (const Babl *format,
static void
gegl_resample_boxfilter_generic (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -1047,8 +1045,8 @@ gegl_resample_boxfilter_generic (guchar *dest_buf,
void gegl_resample_boxfilter (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -1102,8 +1100,8 @@ void gegl_resample_boxfilter (guchar *dest_buf,
static void
gegl_resample_bilinear_generic (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -1155,8 +1153,8 @@ gegl_resample_bilinear_generic (guchar *dest_buf,
void gegl_resample_bilinear (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -1212,8 +1210,8 @@ void gegl_resample_bilinear (guchar *dest_buf,
void
gegl_resample_nearest (guchar *dst,
const guchar *src,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
const gint src_stride,
const gdouble scale,
const gint bpp,
......
......@@ -19,6 +19,7 @@
#ifndef __GEGL_ALGORITHMS_H__
#define __GEGL_ALGORITHMS_H__
#include "gegl-buffer.h"
G_BEGIN_DECLS
#define GEGL_SCALE_EPSILON 1.e-6
......@@ -94,8 +95,8 @@ void gegl_downscale_2x2_nearest (const Babl *format,
*/
void gegl_resample_boxfilter (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -103,8 +104,8 @@ void gegl_resample_boxfilter (guchar *dest_buf,
void gegl_resample_boxfilter_double (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -112,8 +113,8 @@ void gegl_resample_boxfilter_double (guchar *dest_buf,
void gegl_resample_boxfilter_float (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -121,8 +122,8 @@ void gegl_resample_boxfilter_float (guchar *dest_buf,
void gegl_resample_boxfilter_u32 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -130,8 +131,8 @@ void gegl_resample_boxfilter_u32 (guchar *dest_buf,
void gegl_resample_boxfilter_u16 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -139,8 +140,8 @@ void gegl_resample_boxfilter_u16 (guchar *dest_buf,
void gegl_resample_boxfilter_u8 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -151,8 +152,8 @@ void gegl_resample_boxfilter_u8 (guchar *dest_buf,
*/
void gegl_resample_bilinear (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
const Babl *format,
......@@ -160,8 +161,8 @@ void gegl_resample_bilinear (guchar *dest_buf,
void gegl_resample_bilinear_double (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -169,8 +170,8 @@ void gegl_resample_bilinear_double (guchar *dest_buf,
void gegl_resample_bilinear_float (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -178,8 +179,8 @@ void gegl_resample_bilinear_float (guchar *dest_buf,
void gegl_resample_bilinear_u32 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -187,8 +188,8 @@ void gegl_resample_bilinear_u32 (guchar *dest_buf,
void gegl_resample_bilinear_u16 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -196,8 +197,8 @@ void gegl_resample_bilinear_u16 (guchar *dest_buf,
void gegl_resample_bilinear_u8 (guchar *dest_buf,
const guchar *source_buf,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint s_rowstride,
gdouble scale,
gint bpp,
......@@ -205,8 +206,8 @@ void gegl_resample_bilinear_u8 (guchar *dest_buf,
void gegl_resample_nearest (guchar *dst,
const guchar *src,
const GeglBufferRectangle *dst_rect,
const GeglBufferRectangle *src_rect,
const GeglRectangle *dst_rect,
const GeglRectangle *src_rect,
gint src_stride,
gdouble scale,
gint bpp,
......
This diff is collapsed.
......@@ -19,7 +19,6 @@
#ifndef __GEGL_BUFFER_BACKEND_H__
#define __GEGL_BUFFER_BACKEND_H__
#include "gegl-types.h"
G_BEGIN_DECLS
......@@ -31,6 +30,8 @@ typedef struct _GeglTileHandler GeglTileHandler;
typedef void (*GeglTileCallback) (GeglTile *tile,
gpointer user_data);
/* All commands have the ability to pass commands to all tiles the handlers
* add abstraction to the commands the documentaiton given here is valid
* when the commands are issued to a full blown GeglBuffer instance.
......@@ -65,6 +66,8 @@ typedef struct _GeglTileCopyParams
G_END_DECLS
#include "gegl-buffer.h"
#include "gegl-buffer-enums.h"
#include "gegl-tile-backend.h"
#include "gegl-tile-source.h"
#include "gegl-tile-handler.h"
......
......@@ -23,10 +23,9 @@
#include <glib-object.h>
#include <glib/gprintf.h>
#include "gegl.h"
#include "gegl-buffer.h"
#include "gegl-buffer-config.h"
#include "opencl/gegl-cl.h"
G_DEFINE_TYPE (GeglBufferConfig, gegl_buffer_config, G_TYPE_OBJECT)
......
/* This file is part of GEGL
*
* GEGL is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* GEGL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with GEGL; if not, see <https://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <glib-object.h>
#include <glib/gi18n-lib.h>
#include "gegl-buffer-enums.h"
GType
gegl_abyss_policy_get_type (void)
{
static GType etype = 0;
if (etype == 0)
{
static GEnumValue values[] = {
{ GEGL_ABYSS_NONE, N_("None"), "none" },
{ GEGL_ABYSS_CLAMP, N_("Clamp"), "clamp" },
{ GEGL_ABYSS_LOOP, N_("Loop"), "loop" },
{ GEGL_ABYSS_BLACK, N_("Black"), "black" },
{ GEGL_ABYSS_WHITE, N_("White"), "white" },
// we do not really want this one introspected/translated,
// will this bite us?
//{ GEGL_BUFFER_NEAREST, N_("Nearest"), "nearest" },
{ 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);
etype = g_enum_register_static ("GeglAbyssPolicy", values);
}
return etype;
}
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/Write"), "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_sampler_type_get_type (void)
{
static GType etype = 0;
if (etype == 0)
{
static GEnumValue values[] = {
{ GEGL_SAMPLER_NEAREST, N_("Nearest"), "nearest" },
{ GEGL_SAMPLER_LINEAR, N_("Linear"), "linear" },
{ GEGL_SAMPLER_CUBIC, N_("Cubic"), "cubic" },
{ GEGL_SAMPLER_NOHALO, N_("NoHalo"), "nohalo" },
{ GEGL_SAMPLER_LOHALO, N_("LoHalo"), "lohalo" },
{ 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);
etype = g_enum_register_static ("GeglSamplerType", values);
}
return etype;
}
/* This file is part of GEGL
*
* GEGL is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* GEGL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with GEGL; if not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2011 Michael Muré <batolettre@gmail.com>
*
*/
/* This file holds public enums from GEGL
*
* !!!!!!!!!!!! NOTE !!!!!!!!!!!!!!
*
* Normally, gegl-enums.c file would be be generated my glib-mkenums,
* but we use the enum values' registered names for translatable,
* human readable labels for the GUI, so gegl-enums.c is maintained
* manually.
*
* DON'T FORGET TO UPDATE gegl-enums.c AFTER CHANGING THIS HEADER
*
* !!!!!!!!!!!! NOTE !!!!!!!!!!!!!!
*/
#ifndef __GEGL_BUFFER_ENUMS_H__
#define __GEGL_BUFFER_ENUMS_H__
G_BEGIN_DECLS
typedef enum {
/* this enum should be renamed GeglBufferFlags, since it contains
* multiple flags - and possibly more in the future
*/
/* XXX: API tidying of the following would be to make them be
* GEGL_BUFFER_EDGE_NONE or GEGL_BUFFER_REPEAT_NONE instead.
*/
GEGL_ABYSS_NONE = 0,
GEGL_ABYSS_CLAMP = 1,
GEGL_ABYSS_LOOP = 2,
GEGL_ABYSS_BLACK = 3,
GEGL_ABYSS_WHITE = 4,
GEGL_BUFFER_FILTER_AUTO = 0,
/* auto gives bilinear for scales <1.0 box for <2.0 and nearest above */
GEGL_BUFFER_FILTER_BILINEAR = 16,
GEGL_BUFFER_FILTER_NEAREST = 32,
GEGL_BUFFER_FILTER_BOX = 48,
GEGL_BUFFER_FILTER_ALL = (GEGL_BUFFER_FILTER_BILINEAR|
GEGL_BUFFER_FILTER_NEAREST|
GEGL_BUFFER_FILTER_BOX),
} GeglAbyssPolicy;
GType gegl_abyss_policy_get_type (void) G_GNUC_CONST;
#define GEGL_TYPE_ABYSS_POLICY (gegl_abyss_policy_get_type ())
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_SAMPLER_NEAREST,
GEGL_SAMPLER_LINEAR,
GEGL_SAMPLER_CUBIC,
GEGL_SAMPLER_NOHALO,
GEGL_SAMPLER_LOHALO
} GeglSamplerType;
GType gegl_sampler_type_get_type (void) G_GNUC_CONST;
#define GEGL_TYPE_SAMPLER_TYPE (gegl_sampler_type_get_type ())
G_END_DECLS
#endif /* __GEGL_ENUMS_H__ */
......@@ -19,9 +19,10 @@
#ifndef __GEGL_BUFFER_FORMATS_H__
#define __GEGL_BUFFER_FORMATS_H__
#include <babl/babl.h>
G_BEGIN_DECLS
//G_BEGIN_DECLS
#include <babl/babl.h>
/* the code in babl for looking up models, formats and types is quick -
but when formats end up being used as consts for comparisons in the core of
......@@ -79,6 +80,6 @@ GEGL_CACHED_BABL(format, yA_linear_float, "YaA float")
#define GEGL_ALLOCA_THRESHOLD (1024*1024/2)
#endif
G_END_DECLS
//G_END_DECLS
#endif /* __GEGL_BUFFER_FORMATS_H__ */
......@@ -25,11 +25,12 @@
#include <glib-object.h>
#include <glib/gprintf.h>
#include "gegl.h"
#include "gegl-buffer.h"
#include "gegl-buffer-types.h"
#include "gegl-buffer-iterator.h"
#include "gegl-buffer-iterator-private.h"
#include "gegl-buffer-private.h"
#include "gegl-rectangle.h"
typedef enum {
GeglIteratorState_Start,
......@@ -49,7 +50,7 @@ typedef enum {
} GeglIteratorTileMode;
typedef struct _SubIterState {
GeglBufferRectangle full_rect; /* The entire area we are iterating over */
GeglRectangle full_rect; /* The entire area we are iterating over */
GeglBuffer *buffer;
GeglAccessMode access_mode;
GeglAbyssPolicy abyss_policy;
......@@ -57,7 +58,7 @@ typedef struct _SubIterState {
gint format_bpp;
GeglIteratorTileMode current_tile_mode;
gint row_stride;
GeglBufferRectangle real_roi;
GeglRectangle real_roi;
gint level;
/* Direct data members */
GeglTile *current_tile;
......@@ -72,7 +73,7 @@ struct _GeglBufferIteratorPriv
{
gint num_buffers;
GeglIteratorState state;
GeglBufferRectangle origin_tile;
GeglRectangle origin_tile;
gint remaining_rows;
SubIterState sub_iter[GEGL_BUFFER_MAX_ITERATORS];
};
......@@ -100,7 +101,7 @@ gegl_buffer_iterator_empty_new (void)
static inline int
_gegl_buffer_iterator_add (GeglBufferIterator *iter,
GeglBuffer *buf,
const GeglBufferRectangle *roi,
const GeglRectangle *roi,
gint level,
const Babl *format,
GeglAccessMode access_mode,
......@@ -151,7 +152,7 @@ _gegl_buffer_iterator_add (GeglBufferIterator *iter,
int
gegl_buffer_iterator_add (GeglBufferIterator *iter,
GeglBuffer *buf,
const GeglBufferRectangle *roi,
const GeglRectangle *roi,
gint level,
const Babl *format,
GeglAccessMode access_mode,
......@@ -164,7 +165,7 @@ abyss_policy);
GeglBufferIterator *
gegl_buffer_iterator_new (GeglBuffer *buf,
const GeglBufferRectangle *roi,
const GeglRectangle *roi,
gint level,
const Babl *format,
GeglAccessMode access_mode,
......@@ -238,7 +239,7 @@ retile_subs (GeglBufferIterator *iter,
int y)
{
GeglBufferIteratorPriv *priv = iter->priv;
GeglBufferRectangle real_roi;
GeglRectangle real_roi;
int index;
int shift_x = priv->origin_tile.x;
......@@ -555,7 +556,7 @@ _gegl_buffer_iterator_stop (GeglBufferIterator *iter)
sub->access_mode & GEGL_ACCESS_WRITE &&
! (sub->access_mode & GEGL_ITERATOR_INCOMPATIBLE))
{
GeglBufferRectangle damage_rect;
GeglRectangle damage_rect;
damage_rect.x = sub->full_rect.x + sub->buffer->shift_x;
damage_rect.y = sub->full_rect.y + sub->buffer->shift_y;
......
......@@ -43,7 +43,7 @@ typedef struct GeglBufferIterator
{
gint length;
gpointer data[GEGL_BUFFER_MAX_ITERATORS];
GeglBufferRectangle roi[GEGL_BUFFER_MAX_ITERATORS];
GeglRectangle roi[GEGL_BUFFER_MAX_ITERATORS];
/* Private */
GeglBufferIteratorPriv *priv;
} GeglBufferIterator;
......@@ -76,7 +76,7 @@ GeglBufferIterator *gegl_buffer_iterator_empty_new (void);
* buffers pixels.
*/
GeglBufferIterator * gegl_buffer_iterator_new (GeglBuffer *buffer,
const GeglBufferRectangle *roi,
const GeglRectangle *roi,
gint level,
const Babl *format,
GeglAccessMode access_mode,
......@@ -104,7 +104,7 @@ GeglBufferIterator * gegl_buffer_iterator_new (GeglBuffer *buffe
*/
gint gegl_buffer_iterator_add (GeglBufferIterator *iterator,
GeglBuffer *buffer,
const GeglBufferRectangle *roi,
const GeglRectangle *roi,
gint level,
const Babl *format,
GeglAccessMode access_mode,
......
......@@ -25,13 +25,13 @@
#include <glib-object.h>
#include <glib/gprintf.h>
#include "gegl.h"
#include "gegl-buffer.h"
#include "gegl-buffer-types.h"
#include "gegl-rectangle.h"
#include "gegl-buffer-iterator.h"
#include "gegl-buffer-iterator2.h"
#include "gegl-buffer-iterator-private.h"
#include "gegl-buffer-private.h"
#include "gegl-buffer-cl-cache.h"
typedef enum {
GeglIteratorState_Start,
......@@ -51,7 +51,7 @@ typedef enum {
} GeglIteratorTileMode;
typedef struct _SubIterState {
GeglBufferRectangle full_rect; /* The entire area we are iterating over */
GeglRectangle full_rect; /* The entire area we are iterating over */
GeglBuffer *buffer;
GeglAccessMode access_mode;