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

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
This commit is contained in:
Ell 2018-12-02 11:00:14 -05:00
parent dac9bfe334
commit 053e5edc93
41 changed files with 6 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/gimpdrawable-bucket-fill.c
View File

@ -18,7 +18,6 @@
#include "config.h" #include "config.h"
#include <cairo.h> #include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

2
app/core/gimpdrawable-transform.c
View File

@ -15,8 +15,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>

2
app/core/gimphistogram.c
View File

@ -17,8 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
app/core/gimpimage-convert-indexed.c
View File

@ -136,7 +136,6 @@
#include <cairo.h> #include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"

1
app/core/gimplineart.c
View File

@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"

1
app/core/gimppalette-import.c
View File

@ -18,7 +18,6 @@
#include "config.h" #include "config.h"
#include <cairo.h> #include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

1
app/core/gimppickable-contiguous-region.c
View File

@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <cairo.h> #include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

1
app/core/gimpscanconvert.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <cairo.h> #include <cairo.h>

1
app/gegl/gimp-gegl-loops.cc
View File

@ -24,7 +24,6 @@
#include <cairo.h> #include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
extern "C" extern "C"

1
app/gegl/gimp-gegl-mask-combine.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.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"

1
app/gegl/gimp-gegl-mask.c
View File

@ -17,7 +17,6 @@
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "gimp-gegl-types.h" #include "gimp-gegl-types.h"

1
app/operations/gimpoperationcagecoefcalc.c
View File

@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"

1
app/operations/gimpoperationcagetransform.c
View File

@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#include <cairo.h> #include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

1
app/operations/gimpoperationgradient.c
View File

@ -23,7 +23,6 @@
#include "config.h" #include "config.h"
#include <cairo.h> #include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

27
app/operations/gimpoperationmaskcomponents.c
View File

@ -81,7 +81,7 @@ gimp_operation_mask_components_class_init (GimpOperationMaskComponentsClass *kla
NULL); NULL);
operation_class->prepare = gimp_operation_mask_components_prepare; 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; point_class->process = gimp_operation_mask_components_process;
@ -172,7 +172,7 @@ gimp_operation_mask_components_parent_process (GeglOperation *operation,
gint level) gint level)
{ {
GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation); GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
#if 0
if (self->mask == 0) if (self->mask == 0)
{ {
GObject *input = gegl_operation_context_get_object (context, "input"); GObject *input = gegl_operation_context_get_object (context, "input");
@ -189,7 +189,7 @@ gimp_operation_mask_components_parent_process (GeglOperation *operation,
return TRUE; return TRUE;
} }
#endif
return GEGL_OPERATION_CLASS (parent_class)->process (operation, context, return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
output_prop, result, output_prop, result,
level); level);
@ -211,24 +211,10 @@ gimp_operation_mask_components_process (GeglOperation *operation,
GimpComponentMask mask = self->mask; GimpComponentMask mask = self->mask;
static const gfloat nothing[] = { 0.0, 0.0, 0.0, 1.0 }; static const gfloat nothing[] = { 0.0, 0.0, 0.0, 1.0 };
#if 0 if (! aux)
if (self->mask == 0) aux = (gfloat *) nothing;
{
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;
while (samples--) while (samples--)
{ {
dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED]; dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED];
dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN]; dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN];
@ -242,7 +228,6 @@ gimp_operation_mask_components_process (GeglOperation *operation,
dest += 4; dest += 4;
} }
}
return TRUE; return TRUE;
} }

1
app/paint/gimpbrushcore.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"

1
app/paint/gimpheal.c
View File

@ -25,7 +25,6 @@
#include <string.h> #include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"

1
app/paint/gimpink.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"

1
app/paint/gimpmybrushsurface.c
View File

@ -16,7 +16,6 @@
*/ */
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <mypaint-surface.h> #include <mypaint-surface.h>

1
app/paint/gimppaintcore-loops.cc
View File

@ -16,7 +16,6 @@
*/ */
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

1
app/tools/gimpiscissorstool.c
View File

@ -46,7 +46,6 @@
#include <stdlib.h> #include <stdlib.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>

1
libgimpcolor/gimpcolortransform.c
View File

@ -28,7 +28,6 @@
#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"

1
modules/display-filter-aces-rrt.c
View File

@ -17,7 +17,6 @@
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
modules/display-filter-clip-warning.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
modules/display-filter-color-blind.c
View File

@ -29,7 +29,6 @@
#include <string.h> #include <string.h>
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
modules/display-filter-gamma.c
View File

@ -17,7 +17,6 @@
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
modules/display-filter-high-contrast.c
View File

@ -17,7 +17,6 @@
#include "config.h" #include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
plug-ins/common/border-average.c
View File

@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <libgimp/gimp.h> #include <libgimp/gimp.h>

1
plug-ins/common/colormap-remap.c
View File

@ -27,7 +27,6 @@
* *
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/common/compose.c
View File

@ -34,7 +34,6 @@
* They can be dropped for GIMP 3.0 * They can be dropped for GIMP 3.0
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/common/decompose.c
View File

@ -25,7 +25,6 @@
* merged into the officical plug-in by Sven Neumann. * merged into the officical plug-in by Sven Neumann.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/common/file-png.c
View File

@ -38,7 +38,6 @@
* see ChangeLog * see ChangeLog
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>

1
plug-ins/common/gradient-map.c
View File

@ -18,7 +18,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/common/qbist.c
View File

@ -26,7 +26,6 @@
* *
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/file-psd/psd-load.c
View File

@ -18,7 +18,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/file-psd/psd-save.c
View File

@ -63,7 +63,6 @@
* BUGS: * BUGS:
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>

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

@ -42,7 +42,6 @@
* 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>

1
plug-ins/ifs-compose/ifs-compose.c
View File

@ -27,7 +27,6 @@
* 2. Figure out if we need multiple phases for supersampled brushes. * 2. Figure out if we need multiple phases for supersampled brushes.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/pagecurl/pagecurl.c
View File

@ -39,7 +39,6 @@
* 1.0: (July '04) * 1.0: (July '04)
* - Code cleanup, added reverse gradient option. * - Code cleanup, added reverse gradient option.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <libgimp/gimp.h> #include <libgimp/gimp.h>

1
plug-ins/print/print-draw-page.c
View File

@ -15,7 +15,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>

1
plug-ins/screenshot/screenshot-x11.c
View File

@ -20,7 +20,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define GEGL_ITERATOR2_API
#include "config.h" #include "config.h"
#include <libgimp/gimp.h> #include <libgimp/gimp.h>