Commit 5b857dbb authored by Ell's avatar Ell

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

... it's no longer needed, since GEGL commit
gegl@9dcd2cde.

Partially reverts commits:

6fca9959
cc10af72
49c53568
8edbc0d4
29f63616
3a201498
ee48ec68
4165a315
76408527
b7633c72
6ab12061
754a3c5b
22b4b647
55b34383
c6d23add
f03a84d6
822f9f0d
95358ca1
cdda37f4
41e80356
6761da42
fb5d7832
97ed7817
46e90365
ea9c5e6a
24fbdfb5
beb4ecb2
4b77831e
fcf113a3
567ffe94

(cherry picked from commit 053e5edc)
parent edbda430
......@@ -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>
......
......@@ -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>
......
......@@ -136,7 +136,6 @@
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
......
......@@ -18,7 +18,6 @@
#include "config.h"
#include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
......
......@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
......
......@@ -20,7 +20,6 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <cairo.h>
......
......@@ -24,7 +24,6 @@
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
extern "C"
......
......@@ -20,7 +20,6 @@
#include <string.h>
#include <gio/gio.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
......
......@@ -17,7 +17,6 @@
#include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "gimp-gegl-types.h"
......
......@@ -20,7 +20,6 @@
#include "config.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
......
......@@ -20,7 +20,6 @@
#include "config.h"
#include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
......
......@@ -23,7 +23,6 @@
#include "config.h"
#include <cairo.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
......
......@@ -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;
}
......@@ -20,7 +20,6 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
......
......@@ -25,7 +25,6 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
......
......@@ -20,7 +20,6 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
......
......@@ -16,7 +16,6 @@
*/
#include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <mypaint-surface.h>
......
......@@ -16,7 +16,6 @@
*/
#include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
......
......@@ -46,7 +46,6 @@
#include <stdlib.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
......
......@@ -28,7 +28,6 @@
#include <lcms2.h>
#include <gio/gio.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
......
......@@ -20,7 +20,6 @@
#include <string.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gtk/gtk.h>
......
......@@ -29,7 +29,6 @@
#include <string.h>
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gtk/gtk.h>
......
......@@ -17,7 +17,6 @@
#include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gtk/gtk.h>
......
......@@ -17,7 +17,6 @@
#include "config.h"
#define GEGL_ITERATOR2_API
#include <gegl.h>
#include <gtk/gtk.h>
......
......@@ -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>
......
......@@ -27,7 +27,6 @@
*
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <string.h>
......
......@@ -34,7 +34,6 @@
* They can be dropped for GIMP 3.0
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <string.h>
......
......@@ -25,7 +25,6 @@
* merged into the officical plug-in by Sven Neumann.
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <string.h>
......
......@@ -38,7 +38,6 @@
* see ChangeLog
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <stdlib.h>
......
......@@ -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>
......
......@@ -26,7 +26,6 @@
*
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <string.h>
......
......@@ -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>
......
......@@ -63,7 +63,6 @@
* BUGS:
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <errno.h>
......
......@@ -42,7 +42,6 @@
* other special, indirect and consequential damages.
*/
#define GEGL_ITERATOR2_API
#include "config.h"
#include <errno.h>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment