From 053e5edc93c13e9c7a02403b95be5426bfbc7a1d Mon Sep 17 00:00:00 2001 From: Ell Date: Sun, 2 Dec 2018 11:00:14 -0500 Subject: [PATCH] libgimpcolor, app, modules, plug-ins: remove GEGL_ITERATOR2 define ... it's no longer needed, since GEGL commit gegl@9dcd2cde63f95a080bf16a58c10e9ffbdd99aace. Partially reverts commits: 6fca9959c7376ee58ccd5c7be8f0d9d69551c912 cc10af72ccdd6c916fcb52407670c22aa32a1ae9 49c53568d7e9b865f5b49be8f052d783511c90c7 8edbc0d4912f7e9933b7463c9a75ed49298c04e2 29f63616d27a1e69dce7ebdc080250e24a0458f2 3a2014984d35377067a83e86465979d43a6a152d ee48ec6877c2ca1997372e8734d53a37d10ef703 4165a315d59ddb5cce73663b7a8af3f394ae044d 764085278fe351d3915c838c669d7ec50a3fb5bd b7633c722e35e281afe9f8cabed50c846f29ee10 6ab12061b7331bdd6ea69e1ce262ebce4b97a64b 754a3c5b18f314349c25a56c6c0421a613cdfc18 22b4b647bd607ad2cf365fa9ca6a2721cdcd174e 55b3438328e3bc9c6a33fc681825805792bf04b6 c6d23add6539321b04c21a9787fa9069df67549e f03a84d607efe64207b7e7586e722130a5416ea9 822f9f0d2b23e0b5f287c7cdcfe1c10e9a43d9c4 95358ca1fafb1865d3b7040198ec53e7769506e6 cdda37f4ee556c09263f23f0366a3ce7d44604a9 41e8035635292ce09007bf8f5fdaf9cc960c60e8 6761da42b2302341a773fb65f9005ac398b9bff1 fb5d7832a8bfb20a5bc8e349c4920732fe2bd494 97ed7817d86c8a55e1a407cefce3d4ade1af3d42 46e90365784092df948df35e17b3925e3df4bd80 ea9c5e6a4908cc39d3645cf6012c2773ee894c19 24fbdfb5917e0db3b312bc413eef1469811253d5 beb4ecb2383a49c3928ed4e5a1c4766af47f0951 4b77831e036453e21f62edffa46b6c6b00b39a01 fcf113a39cd93390136bf40ca2d0a50c35200b13 567ffe94ff3bc1c1c7cb2a9267fa33595899197d --- app/core/gimpdrawable-bucket-fill.c | 1 - app/core/gimpdrawable-transform.c | 2 -- app/core/gimphistogram.c | 2 -- app/core/gimpimage-convert-indexed.c | 1 - app/core/gimplineart.c | 1 - app/core/gimppalette-import.c | 1 - app/core/gimppickable-contiguous-region.c | 1 - app/core/gimpscanconvert.c | 1 - app/gegl/gimp-gegl-loops.cc | 1 - app/gegl/gimp-gegl-mask-combine.c | 1 - app/gegl/gimp-gegl-mask.c | 1 - app/operations/gimpoperationcagecoefcalc.c | 1 - app/operations/gimpoperationcagetransform.c | 1 - app/operations/gimpoperationgradient.c | 1 - app/operations/gimpoperationmaskcomponents.c | 27 +++++--------------- app/paint/gimpbrushcore.c | 1 - app/paint/gimpheal.c | 1 - app/paint/gimpink.c | 1 - app/paint/gimpmybrushsurface.c | 1 - app/paint/gimppaintcore-loops.cc | 1 - app/tools/gimpiscissorstool.c | 1 - libgimpcolor/gimpcolortransform.c | 1 - modules/display-filter-aces-rrt.c | 1 - modules/display-filter-clip-warning.c | 1 - modules/display-filter-color-blind.c | 1 - modules/display-filter-gamma.c | 1 - modules/display-filter-high-contrast.c | 1 - plug-ins/common/border-average.c | 1 - plug-ins/common/colormap-remap.c | 1 - plug-ins/common/compose.c | 1 - plug-ins/common/decompose.c | 1 - plug-ins/common/file-png.c | 1 - plug-ins/common/gradient-map.c | 1 - plug-ins/common/qbist.c | 1 - plug-ins/file-psd/psd-load.c | 1 - plug-ins/file-psd/psd-save.c | 1 - plug-ins/file-tiff/file-tiff-load.c | 1 - plug-ins/ifs-compose/ifs-compose.c | 1 - plug-ins/pagecurl/pagecurl.c | 1 - plug-ins/print/print-draw-page.c | 1 - plug-ins/screenshot/screenshot-x11.c | 1 - 41 files changed, 6 insertions(+), 63 deletions(-) diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c index a455b9606a..9ff6f0a3da 100644 --- a/app/core/gimpdrawable-bucket-fill.c +++ b/app/core/gimpdrawable-bucket-fill.c @@ -18,7 +18,6 @@ #include "config.h" #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index 2906cf45e5..a18d95cafc 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#define GEGL_ITERATOR2_API - #include "config.h" #include diff --git a/app/core/gimphistogram.c b/app/core/gimphistogram.c index c477676119..8acd927638 100644 --- a/app/core/gimphistogram.c +++ b/app/core/gimphistogram.c @@ -17,8 +17,6 @@ * along with this program. If not, see . */ -#define GEGL_ITERATOR2_API - #include "config.h" #include diff --git a/app/core/gimpimage-convert-indexed.c b/app/core/gimpimage-convert-indexed.c index 476a35fa3e..8560ed8183 100644 --- a/app/core/gimpimage-convert-indexed.c +++ b/app/core/gimpimage-convert-indexed.c @@ -136,7 +136,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpcolor/gimpcolor.h" diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c index 5fa9d8267f..fcc4d67f7f 100644 --- a/app/core/gimplineart.c +++ b/app/core/gimplineart.c @@ -20,7 +20,6 @@ #include "config.h" -#define GEGL_ITERATOR2_API #include #include "libgimpmath/gimpmath.h" diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c index 23c107f3f8..aaa44ead18 100644 --- a/app/core/gimppalette-import.c +++ b/app/core/gimppalette-import.c @@ -18,7 +18,6 @@ #include "config.h" #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/core/gimppickable-contiguous-region.c b/app/core/gimppickable-contiguous-region.c index 28f155bd5f..2ea4fc35d8 100644 --- a/app/core/gimppickable-contiguous-region.c +++ b/app/core/gimppickable-contiguous-region.c @@ -20,7 +20,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c index 108c0e1a47..78b73461b1 100644 --- a/app/core/gimpscanconvert.c +++ b/app/core/gimpscanconvert.c @@ -20,7 +20,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/gegl/gimp-gegl-loops.cc b/app/gegl/gimp-gegl-loops.cc index b3d0713879..1c00206f86 100644 --- a/app/gegl/gimp-gegl-loops.cc +++ b/app/gegl/gimp-gegl-loops.cc @@ -24,7 +24,6 @@ #include #include -#define GEGL_ITERATOR2_API #include extern "C" diff --git a/app/gegl/gimp-gegl-mask-combine.c b/app/gegl/gimp-gegl-mask-combine.c index 9ab093fe8c..122718eead 100644 --- a/app/gegl/gimp-gegl-mask-combine.c +++ b/app/gegl/gimp-gegl-mask-combine.c @@ -20,7 +20,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpbase/gimpbase.h" diff --git a/app/gegl/gimp-gegl-mask.c b/app/gegl/gimp-gegl-mask.c index 4dad33315c..311b05879d 100644 --- 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 #include "gimp-gegl-types.h" diff --git a/app/operations/gimpoperationcagecoefcalc.c b/app/operations/gimpoperationcagecoefcalc.c index 66e7527341..9f7ab7f9f5 100644 --- a/app/operations/gimpoperationcagecoefcalc.c +++ b/app/operations/gimpoperationcagecoefcalc.c @@ -20,7 +20,6 @@ #include "config.h" #include -#define GEGL_ITERATOR2_API #include #include "libgimpmath/gimpmath.h" diff --git a/app/operations/gimpoperationcagetransform.c b/app/operations/gimpoperationcagetransform.c index d2267c8bfa..7ef8ef63d5 100644 --- a/app/operations/gimpoperationcagetransform.c +++ b/app/operations/gimpoperationcagetransform.c @@ -20,7 +20,6 @@ #include "config.h" #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/operations/gimpoperationgradient.c b/app/operations/gimpoperationgradient.c index ec3a0164c7..466de0a3a7 100644 --- a/app/operations/gimpoperationgradient.c +++ b/app/operations/gimpoperationgradient.c @@ -23,7 +23,6 @@ #include "config.h" #include -#define GEGL_ITERATOR2_API #include #include diff --git a/app/operations/gimpoperationmaskcomponents.c b/app/operations/gimpoperationmaskcomponents.c index 8a8756cb7a..1c9425c410 100644 --- 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; } diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c index d46ecba72a..a5756f8707 100644 --- a/app/paint/gimpbrushcore.c +++ b/app/paint/gimpbrushcore.c @@ -20,7 +20,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpmath/gimpmath.h" diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c index 140baf0504..ca1282fc01 100644 --- a/app/paint/gimpheal.c +++ b/app/paint/gimpheal.c @@ -25,7 +25,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpbase/gimpbase.h" diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 7531ece643..08c86d99e5 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -20,7 +20,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpmath/gimpmath.h" diff --git a/app/paint/gimpmybrushsurface.c b/app/paint/gimpmybrushsurface.c index dece18ae1d..9b4283cb61 100644 --- a/app/paint/gimpmybrushsurface.c +++ b/app/paint/gimpmybrushsurface.c @@ -16,7 +16,6 @@ */ #include "config.h" -#define GEGL_ITERATOR2_API #include #include diff --git a/app/paint/gimppaintcore-loops.cc b/app/paint/gimppaintcore-loops.cc index 30f0756fe1..aae0321a6e 100644 --- a/app/paint/gimppaintcore-loops.cc +++ b/app/paint/gimppaintcore-loops.cc @@ -16,7 +16,6 @@ */ #include "config.h" -#define GEGL_ITERATOR2_API #include #include diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index 98c3b5a61c..fe80f88a5e 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -46,7 +46,6 @@ #include -#define GEGL_ITERATOR2_API #include #include #include diff --git a/libgimpcolor/gimpcolortransform.c b/libgimpcolor/gimpcolortransform.c index f761a93683..4ffb76ef78 100644 --- a/libgimpcolor/gimpcolortransform.c +++ b/libgimpcolor/gimpcolortransform.c @@ -28,7 +28,6 @@ #include #include -#define GEGL_ITERATOR2_API #include #include "libgimpbase/gimpbase.h" diff --git a/modules/display-filter-aces-rrt.c b/modules/display-filter-aces-rrt.c index 14421caf80..75ffe1c7fe 100644 --- 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 #include diff --git a/modules/display-filter-clip-warning.c b/modules/display-filter-clip-warning.c index 71e92736c2..89d290dadb 100644 --- a/modules/display-filter-clip-warning.c +++ b/modules/display-filter-clip-warning.c @@ -20,7 +20,6 @@ #include -#define GEGL_ITERATOR2_API #include #include diff --git a/modules/display-filter-color-blind.c b/modules/display-filter-color-blind.c index 604f3f0d10..2d5785ccad 100644 --- a/modules/display-filter-color-blind.c +++ b/modules/display-filter-color-blind.c @@ -29,7 +29,6 @@ #include -#define GEGL_ITERATOR2_API #include #include diff --git a/modules/display-filter-gamma.c b/modules/display-filter-gamma.c index 0813e47912..c579742696 100644 --- a/modules/display-filter-gamma.c +++ b/modules/display-filter-gamma.c @@ -17,7 +17,6 @@ #include "config.h" -#define GEGL_ITERATOR2_API #include #include diff --git a/modules/display-filter-high-contrast.c b/modules/display-filter-high-contrast.c index 7c7c512738..7cf1ac01df 100644 --- 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 #include diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index d8c157b964..e89002a08c 100644 --- 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 . */ -#define GEGL_ITERATOR2_API #include "config.h" #include diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 493bbeda22..34edd2cf46 100644 --- 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 diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 705f4c24c1..557d085a9c 100644 --- 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 diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 24c8f0ea57..01570c94c7 100644 --- 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 diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 6ac721b803..e065b17ccf 100644 --- 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 diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c index a3afdc7250..94c3f009da 100644 --- 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 . */ -#define GEGL_ITERATOR2_API #include "config.h" #include diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index 2cf6a34b40..5f1b42fa1d 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -26,7 +26,6 @@ * */ -#define GEGL_ITERATOR2_API #include "config.h" #include diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c index 690321a145..962cc1a132 100644 --- 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 . */ -#define GEGL_ITERATOR2_API #include "config.h" #include diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index dc643ef96e..168c994bac 100644 --- 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 diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c index 1097c31342..4862b7cb3b 100644 --- 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 diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 372ef46f87..31db6c5c68 100644 --- 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 diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 40442565c0..c2d3830fe2 100644 --- 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 diff --git a/plug-ins/print/print-draw-page.c b/plug-ins/print/print-draw-page.c index 26a2ac96a8..7fb023971b 100644 --- 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 . */ -#define GEGL_ITERATOR2_API #include "config.h" #include diff --git a/plug-ins/screenshot/screenshot-x11.c b/plug-ins/screenshot/screenshot-x11.c index 61c9e535c2..2f316d5037 100644 --- 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 . */ -#define GEGL_ITERATOR2_API #include "config.h" #include