[gimp/gimp-2-10] plug-ins: compose migrated to new iterator api
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] plug-ins: compose migrated to new iterator api
- Date: Tue, 18 Sep 2018 10:38:51 +0000 (UTC)
commit ab1bb27129c5a3d189f97868369b4a8a6f1c9bbf
Author: Øyvind Kolås <pippin gimp org>
Date: Tue Sep 11 01:52:42 2018 +0200
plug-ins: compose migrated to new iterator api
(cherry picked from commit b7633c722e35e281afe9f8cabed50c846f29ee10)
plug-ins/common/compose.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index c6bf81d13a..f387d163b2 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -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++)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]