callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpcolor: migrate to new iterator api

Browse Source
This commit is contained in:
Øyvind Kolås
2018-09-11 01:37:42 +02:00
parent 41e8035635
commit cdda37f4ee
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libgimpcolor/gimpcolortransform.c
View File

@ -28,6 +28,7 @@
#include <lcms2.h> #include <lcms2.h>
#include <gio/gio.h> #include <gio/gio.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
@ -555,7 +556,7 @@ gimp_color_transform_process_buffer (GimpColorTransform *transform,
iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0, iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0,
src_format, src_format,
GEGL_ACCESS_READ, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE); GEGL_ABYSS_NONE, 2);
gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0, gegl_buffer_iterator_add (iter, dest_buffer, dest_rect, 0,
dest_format, dest_format,
@ -567,15 +568,15 @@ gimp_color_transform_process_buffer (GimpColorTransform *transform,
if (priv->transform) if (priv->transform)
{ {
cmsDoTransform (priv->transform, cmsDoTransform (priv->transform,
iter->data[0], iter->data[1], iter->length); iter->items[0].data, iter->items[1].data, iter->length);
} }
else else
{ {
babl_process (priv->fish, babl_process (priv->fish,
iter->data[0], iter->data[1], iter->length); iter->items[0].data, iter->items[1].data, iter->length);
} }
done_pixels += iter->roi[0].width * iter->roi[0].height; done_pixels += iter->items[0].roi.width * iter->items[0].roi.height;
g_signal_emit (transform, gimp_color_transform_signals[PROGRESS], 0, g_signal_emit (transform, gimp_color_transform_signals[PROGRESS], 0,
(gdouble) done_pixels / (gdouble) done_pixels /
@ -587,22 +588,22 @@ gimp_color_transform_process_buffer (GimpColorTransform *transform,
iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0, iter = gegl_buffer_iterator_new (src_buffer, src_rect, 0,
src_format, src_format,
GEGL_ACCESS_READWRITE, GEGL_ACCESS_READWRITE,
GEGL_ABYSS_NONE); GEGL_ABYSS_NONE, 1);
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
if (priv->transform) if (priv->transform)
{ {
cmsDoTransform (priv->transform, cmsDoTransform (priv->transform,
iter->data[0], iter->data[0], iter->length); iter->items[0].data, iter->items[0].data, iter->length);
} }
else else
{ {
babl_process (priv->fish, babl_process (priv->fish,
iter->data[0], iter->data[0], iter->length); iter->items[0].data, iter->items[0].data, iter->length);
} }
done_pixels += iter->roi[0].width * iter->roi[0].height; done_pixels += iter->items[0].roi.width * iter->items[0].roi.height;
g_signal_emit (transform, gimp_color_transform_signals[PROGRESS], 0, g_signal_emit (transform, gimp_color_transform_signals[PROGRESS], 0,
(gdouble) done_pixels / (gdouble) done_pixels /