plug-ins: compose migrated to new iterator api

This commit is contained in:
Øyvind Kolås 2018-09-11 01:52:42 +02:00
parent 6ab12061b7
commit b7633c722e

View file

@ -34,6 +34,7 @@
* They can be dropped for GIMP 3.0
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <string.h>
@ -658,11 +659,11 @@ cpn_affine_transform (GeglBuffer *buffer,
gegl_buffer_set_format (buffer, babl_format ("Y double"));
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))
{
gdouble *data = gi->data[0];
gdouble *data = gi->items[0].data;
guint k;
for (k = 0; k < gi->length; k++)
@ -683,7 +684,7 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES],
gint j;
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++)
{
@ -695,13 +696,13 @@ fill_buffer_from_components (GeglBuffer *temp[MAX_COMPOSE_IMAGES],
while (gegl_buffer_iterator_next (gi))
{
gdouble *src_data[MAX_COMPOSE_IMAGES];
gdouble *dst_data = (gdouble*) gi->data[0];
gdouble *dst_data = (gdouble*) gi->items[0].data;
gulong k, count;
count = 1;
for (j = 0; j < num_cpn; j++)
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++)
{