[gegl/gsoc2009-gpu] Rename GEGL_BUFFER_MAX_ITERATORS to GEGL_BUFFER_MAX_ITERABLES



commit adb0fa61c0c3cd9de7bb44ff696aa032d0bf8835
Author: Jerson Michael Perpetua <jersonperpetua gmail com>
Date:   Sun Jul 5 02:26:26 2009 +0800

    Rename GEGL_BUFFER_MAX_ITERATORS to GEGL_BUFFER_MAX_ITERABLES
    
    Rename GEGL_BUFFER_MAX_ITERATORS to
    GEGL_BUFFER_MAX_ITERABLES to avoid confusion with how
    a GeglBufferIterator can contain multiple iterators.

 gegl/buffer/gegl-buffer-iterator.c |   18 +++++++++---------
 gegl/buffer/gegl-buffer-iterator.h |   10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer-iterator.c b/gegl/buffer/gegl-buffer-iterator.c
index ac789ff..f221595 100644
--- a/gegl/buffer/gegl-buffer-iterator.c
+++ b/gegl/buffer/gegl-buffer-iterator.c
@@ -63,18 +63,18 @@ typedef struct _GeglBufferIterator
 {
   /* current region of interest */
   gint          length;             /* length of current data in pixels */
-  gpointer      data[GEGL_BUFFER_MAX_ITERATORS]; 
-  GeglRectangle roi [GEGL_BUFFER_MAX_ITERATORS];                 
+  gpointer      data[GEGL_BUFFER_MAX_ITERABLES]; 
+  GeglRectangle roi [GEGL_BUFFER_MAX_ITERABLES];                 
 
   /* the following is private: */
   gint           iterators;
   gint           iteration_no;
-  GeglRectangle  rect       [GEGL_BUFFER_MAX_ITERATORS];
-  const Babl    *format     [GEGL_BUFFER_MAX_ITERATORS];
-  GeglBuffer    *buffer     [GEGL_BUFFER_MAX_ITERATORS];
-  guint          flags      [GEGL_BUFFER_MAX_ITERATORS];
-  gpointer       buf        [GEGL_BUFFER_MAX_ITERATORS]; 
-  _GeglBufferTileIterator  i[GEGL_BUFFER_MAX_ITERATORS]; 
+  GeglRectangle  rect       [GEGL_BUFFER_MAX_ITERABLES];
+  const Babl    *format     [GEGL_BUFFER_MAX_ITERABLES];
+  GeglBuffer    *buffer     [GEGL_BUFFER_MAX_ITERABLES];
+  guint          flags      [GEGL_BUFFER_MAX_ITERABLES];
+  gpointer       buf        [GEGL_BUFFER_MAX_ITERABLES]; 
+  _GeglBufferTileIterator  i[GEGL_BUFFER_MAX_ITERABLES]; 
 } _GeglBufferIterator;
 
 
@@ -256,7 +256,7 @@ gegl_buffer_iterator_add (GeglBufferIterator  *iterator,
 {
   _GeglBufferIterator *i = (gpointer)iterator;
   gint self = 0;
-  if (i->iterators+1 > GEGL_BUFFER_MAX_ITERATORS)
+  if (i->iterators+1 > GEGL_BUFFER_MAX_ITERABLES)
     {
       g_error ("too many iterators (%i)", i->iterators+1);
     }
diff --git a/gegl/buffer/gegl-buffer-iterator.h b/gegl/buffer/gegl-buffer-iterator.h
index 6921b79..d922de0 100644
--- a/gegl/buffer/gegl-buffer-iterator.h
+++ b/gegl/buffer/gegl-buffer-iterator.h
@@ -22,7 +22,7 @@
 
 #include "gegl-buffer.h"
 
-#define GEGL_BUFFER_MAX_ITERATORS 6
+#define GEGL_BUFFER_MAX_ITERABLES 6
 
 #define GEGL_BUFFER_READ      1
 #define GEGL_BUFFER_WRITE     2
@@ -31,8 +31,8 @@
 typedef struct GeglBufferIterator
 {
   gint          length;
-  gpointer      data[GEGL_BUFFER_MAX_ITERATORS];
-  GeglRectangle roi[GEGL_BUFFER_MAX_ITERATORS];
+  gpointer      data[GEGL_BUFFER_MAX_ITERABLES];
+  GeglRectangle roi[GEGL_BUFFER_MAX_ITERABLES];
 } GeglBufferIterator;
 
 
@@ -64,8 +64,8 @@ GeglBufferIterator * gegl_buffer_iterator_new  (GeglBuffer          *buffer,
  * @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.
  *
- * 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
+ * Adds an additional buffer iterable that will be processed in sync with
+ * the original one, if the buffer doesn't align with the other for tile access,
  * the corresponding scans and regions will be serialized automatically using
  * gegl_buffer_get.
  *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]