libgimpcolor, app, modules, plug-ins: remove GEGL_ITERATOR2 define

... it's no longer needed, since GEGL commit gegl@9dcd2cde63f95a080bf16a58c10e9ffbdd99aace. Partially reverts commits: 6fca9959c7 cc10af72cc 49c53568d7 8edbc0d491 29f63616d2 3a2014984d ee48ec6877 4165a315d5 764085278f b7633c722e 6ab12061b7 754a3c5b18 22b4b647bd 55b3438328 c6d23add65 f03a84d607 822f9f0d2b 95358ca1fa cdda37f4ee 41e8035635 6761da42b2 fb5d7832a8 97ed7817d8 46e9036578 ea9c5e6a49 24fbdfb591 beb4ecb238 4b77831e03 fcf113a39c 567ffe94ff
2018-12-02 11:00:14 -05:00 · 2018-12-02 11:00:14 -05:00 · 053e5edc93
commit 053e5edc93
parent dac9bfe334
41 changed files with 6 additions and 63 deletions
--- a/app/core/gimpdrawable-bucket-fill.c
+++ b/app/core/gimpdrawable-bucket-fill.c
@ -18,7 +18,6 @@
 #include "config.h"

 #include <cairo.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/core/gimpdrawable-transform.c
+++ b/app/core/gimpdrawable-transform.c
@ -15,8 +15,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
-
 #include "config.h"

 #include <stdlib.h>
--- a/app/core/gimphistogram.c
+++ b/app/core/gimphistogram.c
@ -17,8 +17,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
-
 #include "config.h"

 #include <string.h>
--- a/app/core/gimpimage-convert-indexed.c
+++ b/app/core/gimpimage-convert-indexed.c
@ -136,7 +136,6 @@

 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpcolor/gimpcolor.h"
--- a/app/core/gimplineart.c
+++ b/app/core/gimplineart.c
@ -20,7 +20,6 @@

 #include "config.h"

-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpmath/gimpmath.h"
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@ -18,7 +18,6 @@
 #include "config.h"

 #include <cairo.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/core/gimppickable-contiguous-region.c
+++ b/app/core/gimppickable-contiguous-region.c
@ -20,7 +20,6 @@
 #include <stdlib.h>

 #include <cairo.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/core/gimpscanconvert.c
+++ b/app/core/gimpscanconvert.c
@ -20,7 +20,6 @@
 #include <string.h>

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include <cairo.h>
--- a/app/gegl/gimp-gegl-loops.cc
+++ b/app/gegl/gimp-gegl-loops.cc
@ -24,7 +24,6 @@

 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 extern "C"
--- a/app/gegl/gimp-gegl-mask-combine.c
+++ b/app/gegl/gimp-gegl-mask-combine.c
@ -20,7 +20,6 @@
 #include <string.h>

 #include <gio/gio.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpbase/gimpbase.h"
--- a/app/gegl/gimp-gegl-mask.c
+++ b/app/gegl/gimp-gegl-mask.c
@ -17,7 +17,6 @@

 #include "config.h"

-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "gimp-gegl-types.h"
--- a/app/operations/gimpoperationcagecoefcalc.c
+++ b/app/operations/gimpoperationcagecoefcalc.c
@ -20,7 +20,6 @@
 #include "config.h"

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpmath/gimpmath.h"
--- a/app/operations/gimpoperationcagetransform.c
+++ b/app/operations/gimpoperationcagetransform.c
@ -20,7 +20,6 @@
 #include "config.h"

 #include <cairo.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/operations/gimpoperationgradient.c
+++ b/app/operations/gimpoperationgradient.c
@ -23,7 +23,6 @@
 #include "config.h"

 #include <cairo.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/operations/gimpoperationmaskcomponents.c
+++ b/app/operations/gimpoperationmaskcomponents.c
@ -81,7 +81,7 @@ gimp_operation_mask_components_class_init (GimpOperationMaskComponentsClass *kla
                                 NULL);

  operation_class->prepare = gimp_operation_mask_components_prepare;
-  //operation_class->process = gimp_operation_mask_components_parent_process;
+  operation_class->process = gimp_operation_mask_components_parent_process;

  point_class->process     = gimp_operation_mask_components_process;

@ -172,7 +172,7 @@ gimp_operation_mask_components_parent_process (GeglOperation        *operation,
                                               gint                  level)
 {
  GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
-#if 0
+
  if (self->mask == 0)
    {
      GObject *input = gegl_operation_context_get_object (context, "input");
@ -189,7 +189,7 @@ gimp_operation_mask_components_parent_process (GeglOperation        *operation,

      return TRUE;
    }
-#endif
+
  return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
                                                       output_prop, result,
                                                       level);
@ -211,24 +211,10 @@ gimp_operation_mask_components_process (GeglOperation       *operation,
  GimpComponentMask            mask = self->mask;
  static const gfloat          nothing[] = { 0.0, 0.0, 0.0, 1.0 };

-#if 0
-  if (self->mask == 0)
-  {
-    if (in_buf != out_buf)
-      memcpy (out_buf, in_buf, sizeof (float) * 4 * samples);
-  }
-  else if (self->mask == GIMP_COMPONENT_MASK_ALL && aux_buf)
-  {
-    if (aux_buf != out_buf)
-      memcpy (out_buf, aux_buf, sizeof (float) * 4 * samples);
-  }
-  else
-#endif
-  {
-    if (! aux)
-      aux = (gfloat *) nothing;
+  if (! aux)
+    aux = (gfloat *) nothing;

-    while (samples--)
+  while (samples--)
    {
      dest[RED]   = (mask & GIMP_COMPONENT_MASK_RED)   ? aux[RED]   : src[RED];
      dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN];
@ -242,7 +228,6 @@ gimp_operation_mask_components_process (GeglOperation       *operation,

      dest += 4;
    }
-  }

  return TRUE;
 }
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@ -20,7 +20,6 @@
 #include <string.h>

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpmath/gimpmath.h"
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@ -25,7 +25,6 @@
 #include <string.h>

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpbase/gimpbase.h"
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@ -20,7 +20,6 @@
 #include <string.h>

 #include <gdk-pixbuf/gdk-pixbuf.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpmath/gimpmath.h"
--- a/app/paint/gimpmybrushsurface.c
+++ b/app/paint/gimpmybrushsurface.c
@ -16,7 +16,6 @@
 */

 #include "config.h"
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include <mypaint-surface.h>
--- a/app/paint/gimppaintcore-loops.cc
+++ b/app/paint/gimppaintcore-loops.cc
@ -16,7 +16,6 @@
 */

 #include "config.h"
-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@ -46,7 +46,6 @@

 #include <stdlib.h>

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
--- a/libgimpcolor/gimpcolortransform.c
+++ b/libgimpcolor/gimpcolortransform.c
@ -28,7 +28,6 @@
 #include <lcms2.h>

 #include <gio/gio.h>
-#define GEGL_ITERATOR2_API
 #include <gegl.h>

 #include "libgimpbase/gimpbase.h"
--- a/modules/display-filter-aces-rrt.c
+++ b/modules/display-filter-aces-rrt.c
@ -17,7 +17,6 @@

 #include "config.h"

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>

--- a/modules/display-filter-clip-warning.c
+++ b/modules/display-filter-clip-warning.c
@ -20,7 +20,6 @@

 #include <string.h>

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>

--- a/modules/display-filter-color-blind.c
+++ b/modules/display-filter-color-blind.c
@ -29,7 +29,6 @@

 #include <string.h>

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>

--- a/modules/display-filter-gamma.c
+++ b/modules/display-filter-gamma.c
@ -17,7 +17,6 @@

 #include "config.h"

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>

--- a/modules/display-filter-high-contrast.c
+++ b/modules/display-filter-high-contrast.c
@ -17,7 +17,6 @@

 #include "config.h"

-#define GEGL_ITERATOR2_API
 #include <gegl.h>
 #include <gtk/gtk.h>

--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@ -17,7 +17,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <libgimp/gimp.h>
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@ -27,7 +27,6 @@
 *
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@ -34,7 +34,6 @@
 * They can be dropped for GIMP 3.0
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@ -25,7 +25,6 @@
 *  merged into the officical plug-in by Sven Neumann.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@ -38,7 +38,6 @@
 *   see ChangeLog
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <stdlib.h>
--- a/plug-ins/common/gradient-map.c
+++ b/plug-ins/common/gradient-map.c
@ -18,7 +18,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"
 #include <string.h>

--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@ -26,7 +26,6 @@
 *
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@ -18,7 +18,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/file-psd/psd-save.c
+++ b/plug-ins/file-psd/psd-save.c
@ -63,7 +63,6 @@
 * BUGS:
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <errno.h>
--- a/plug-ins/file-tiff/file-tiff-load.c
+++ b/plug-ins/file-tiff/file-tiff-load.c
@ -42,7 +42,6 @@
 * other special, indirect and consequential damages.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <errno.h>
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@ -27,7 +27,6 @@
 * 2. Figure out if we need multiple phases for supersampled brushes.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@ -39,7 +39,6 @@
 * 1.0: (July '04)
 *      - Code cleanup, added reverse gradient option.
 */
-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <libgimp/gimp.h>
--- a/plug-ins/print/print-draw-page.c
+++ b/plug-ins/print/print-draw-page.c
@ -15,7 +15,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <string.h>
--- a/plug-ins/screenshot/screenshot-x11.c
+++ b/plug-ins/screenshot/screenshot-x11.c
@ -20,7 +20,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-#define GEGL_ITERATOR2_API
 #include "config.h"

 #include <libgimp/gimp.h>