dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: migrate file-tiff-load to new iterator api

This commit is contained in:
Øyvind Kolås 2018-09-11 02:03:09 +02:00
parent 3a2014984d
commit 29f63616d2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plug-ins/file-tiff/file-tiff-load.c
View File

@ -42,6 +42,7 @@
* other special, indirect and consequential damages. * other special, indirect and consequential damages.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>
@ -1469,7 +1470,7 @@ load_contiguous (TIFF *tif,
GEGL_RECTANGLE (0, 0, cols, rows), GEGL_RECTANGLE (0, 0, cols, rows),
0, NULL, 0, NULL,
GEGL_ACCESS_READ, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE); GEGL_ABYSS_NONE, 2);
gegl_buffer_iterator_add (iter, channel[i].buffer, gegl_buffer_iterator_add (iter, channel[i].buffer,
GEGL_RECTANGLE (x, y, cols, rows), GEGL_RECTANGLE (x, y, cols, rows),
0, channel[i].format, 0, channel[i].format,
@ -1477,8 +1478,8 @@ load_contiguous (TIFF *tif,
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
guchar *s = iter->data[0]; guchar *s = iter->items[0].data;
guchar *d = iter->data[1]; guchar *d = iter->items[1].data;
gint length = iter->length; gint length = iter->length;
s += offset; s += offset;
@ -1619,7 +1620,7 @@ load_separate (TIFF *tif,
GEGL_RECTANGLE (0, 0, cols, rows), GEGL_RECTANGLE (0, 0, cols, rows),
0, NULL, 0, NULL,
GEGL_ACCESS_READ, GEGL_ACCESS_READ,
GEGL_ABYSS_NONE); GEGL_ABYSS_NONE, 2);
gegl_buffer_iterator_add (iter, channel[i].buffer, gegl_buffer_iterator_add (iter, channel[i].buffer,
GEGL_RECTANGLE (x, y, cols, rows), GEGL_RECTANGLE (x, y, cols, rows),
0, channel[i].format, 0, channel[i].format,
@ -1628,8 +1629,8 @@ load_separate (TIFF *tif,
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
guchar *s = iter->data[0]; guchar *s = iter->items[0].data;
guchar *d = iter->data[1]; guchar *d = iter->items[1].data;
gint length = iter->length; gint length = iter->length;
d += offset; d += offset;