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

plug-ins: compose migrated to new iterator api

parent 6ab12061
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
* They can be dropped for GIMP 3.0 * They can be dropped for GIMP 3.0
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -658,11 +659,11 @@ cpn_affine_transform (GeglBuffer *buffer, ...@@ -658,11 +659,11 @@ cpn_affine_transform (GeglBuffer *buffer,
gegl_buffer_set_format (buffer, babl_format ("Y double")); gegl_buffer_set_format (buffer, babl_format ("Y double"));
gi = gegl_buffer_iterator_new (buffer, NULL, 0, NULL, gi = gegl_buffer_iterator_new (buffer, NULL, 0, NULL,
GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE); GEGL_ACCESS_READWRITE, GEGL_ABYSS_NONE, 1);
while (gegl_buffer_iterator_next (gi)) while (gegl_buffer_iterator_next (gi))
{ {
gdouble *data = gi->data[0]; gdouble *data = gi->items[0].data;
guint k; guint k;
for (k = 0; k < gi->length; k++) for (k = 0; k < gi->length; k++)
...@@ -683,7 +684,7 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES], ...@@ -683,7 +684,7 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES],
gint j; gint j;
gi = gegl_buffer_iterator_new (dst, NULL, 0, NULL, gi = gegl_buffer_iterator_new (dst, NULL, 0, NULL,
GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE); GEGL_ACCESS_WRITE, GEGL_ABYSS_NONE, 10);
for (j = 0; j < num_cpn; j++) for (j = 0; j < num_cpn; j++)
{ {
...@@ -695,13 +696,13 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES], ...@@ -695,13 +696,13 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES],
while (gegl_buffer_iterator_next (gi)) while (gegl_buffer_iterator_next (gi))
{ {
gdouble *src_data[MAX_COMPOSE_IMAGES]; gdouble *src_data[MAX_COMPOSE_IMAGES];
gdouble *dst_data = (gdouble*) gi->data[0]; gdouble *dst_data = (gdouble*) gi->items[0].data;
gulong k, count; gulong k, count;
count = 1; count = 1;
for (j = 0; j < num_cpn; j++) for (j = 0; j < num_cpn; j++)
if (inputs[j].is_ID) if (inputs[j].is_ID)
src_data[j] = (gdouble*) gi->data[count++]; src_data[j] = (gdouble*) gi->items[count++].data;
for (k = 0; k < gi->length; k++) for (k = 0; k < gi->length; k++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment