[gimp] app: duplicate difference mode, new and legacy
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: duplicate difference mode, new and legacy
- Date: Mon, 9 Jan 2017 22:49:29 +0000 (UTC)
commit b6be1b768e7bb3bb84df39f907451a08846e099e
Author: Øyvind Kolås <pippin gimp org>
Date: Mon Jan 9 23:44:57 2017 +0100
app: duplicate difference mode, new and legacy
app/core/core-enums.c | 4 +-
app/core/core-enums.h | 5 +-
app/gegl/gimp-gegl-nodes.c | 7 +-
app/operations/Makefile.am | 2 -
app/operations/layer-modes-legacy/Makefile.am | 4 +-
.../gimpoperationdifferencelegacy.c} | 62 +++++-----
.../gimpoperationdifferencelegacy.h | 62 +++++++++
app/operations/layer-modes/Makefile.am | 4 +-
.../layer-modes/gimpoperationdifference.c | 136 ++++++++++++++++++++
.../gimpoperationdifference.h} | 35 +++---
app/widgets/gimpwidgets-constructors.c | 3 +-
11 files changed, 267 insertions(+), 57 deletions(-)
---
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
index d7d03cd..06a153e 100644
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -322,6 +322,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_MULTIPLY_LINEAR, "GIMP_LAYER_MODE_MULTIPLY_LINEAR", "multiply-linear" },
{ GIMP_LAYER_MODE_DODGE, "GIMP_LAYER_MODE_DODGE", "dodge" },
{ GIMP_LAYER_MODE_SCREEN, "GIMP_LAYER_MODE_SCREEN", "screen" },
+ { GIMP_LAYER_MODE_DIFFERENCE, "GIMP_LAYER_MODE_DIFFERENCE", "difference" },
{ GIMP_LAYER_MODE_ERASE, "GIMP_LAYER_MODE_ERASE", "erase" },
{ GIMP_LAYER_MODE_REPLACE, "GIMP_LAYER_MODE_REPLACE", "replace" },
{ GIMP_LAYER_MODE_ANTI_ERASE, "GIMP_LAYER_MODE_ANTI_ERASE", "anti-erase" },
@@ -336,7 +337,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL },
{ GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen (legacy)"), NULL },
{ GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old broken Overlay"), NULL },
- { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference"), NULL },
+ { GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference (legacy)"), NULL },
{ GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition"), NULL },
{ GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract"), NULL },
{ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only"), NULL },
@@ -363,6 +364,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_MULTIPLY_LINEAR, NC_("layer-mode", "Multiply (linear)"), NULL },
{ GIMP_LAYER_MODE_DODGE, NC_("layer-mode", "Dodge"), NULL },
{ GIMP_LAYER_MODE_SCREEN, NC_("layer-mode", "Screen"), NULL },
+ { GIMP_LAYER_MODE_DIFFERENCE, NC_("layer-mode", "Difference"), NULL },
{ GIMP_LAYER_MODE_ERASE, NC_("layer-mode", "Erase"), NULL },
{ GIMP_LAYER_MODE_REPLACE, NC_("layer-mode", "Replace"), NULL },
{ GIMP_LAYER_MODE_ANTI_ERASE, NC_("layer-mode", "Anti erase"), NULL },
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 7df91fa..ef1395d 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -158,9 +158,9 @@ typedef enum
GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/
GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/
GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/
- GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen (legacyy)" >*/
+ GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen (legacy)" >*/
GIMP_LAYER_MODE_OVERLAY_LEGACY, /*< desc="Old broken Overlay" >*/
- GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference" >*/
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference (legacy)" >*/
GIMP_LAYER_MODE_ADDITION_LEGACY, /*< desc="Addition" >*/
GIMP_LAYER_MODE_SUBTRACT_LEGACY, /*< desc="Subtract" >*/
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, /*< desc="Darken only" >*/
@@ -187,6 +187,7 @@ typedef enum
GIMP_LAYER_MODE_MULTIPLY_LINEAR, /*< desc="Multiply (linear)" >*/
GIMP_LAYER_MODE_DODGE, /*< desc="Dodge" >*/
GIMP_LAYER_MODE_SCREEN, /*< desc="Screen" >*/
+ GIMP_LAYER_MODE_DIFFERENCE, /*< desc="Difference" >*/
/* internal modes, not available to the PDB */
GIMP_LAYER_MODE_ERASE = 1000, /*< pdb-skip, desc="Erase" >*/
diff --git a/app/gegl/gimp-gegl-nodes.c b/app/gegl/gimp-gegl-nodes.c
index 10adca8..4e370f5 100644
--- a/app/gegl/gimp-gegl-nodes.c
+++ b/app/gegl/gimp-gegl-nodes.c
@@ -183,8 +183,12 @@ gimp_gegl_mode_node_set_mode (GeglNode *node,
operation = "gimp:softlight-mode";
break;
+ case GIMP_LAYER_MODE_DIFFERENCE:
+ operation = "gimp:difference";
+ break;
+
case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
- operation = "gimp:difference-mode";
+ operation = "gimp:difference-legacyy";
break;
case GIMP_LAYER_MODE_ADDITION_LEGACY:
@@ -323,6 +327,7 @@ gimp_gegl_mode_node_set_mode (GeglNode *node,
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
case GIMP_LAYER_MODE_OVERLAY_LEGACY:
case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
+ case GIMP_LAYER_MODE_DIFFERENCE:
case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 9a39e8f..e76b21c 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -103,8 +103,6 @@ libappoperations_a_SOURCES = \
gimpoperationbehindmode.h \
gimpoperationoverlaymode.c \
gimpoperationoverlaymode.h \
- gimpoperationdifferencemode.c \
- gimpoperationdifferencemode.h \
gimpoperationadditionmode.c \
gimpoperationadditionmode.h \
gimpoperationsubtractmode.c \
diff --git a/app/operations/layer-modes-legacy/Makefile.am b/app/operations/layer-modes-legacy/Makefile.am
index f9cccf0..e3e2d7a 100644
--- a/app/operations/layer-modes-legacy/Makefile.am
+++ b/app/operations/layer-modes-legacy/Makefile.am
@@ -20,4 +20,6 @@ libapplayermodeslegacy_a_SOURCES = \
gimpoperationdodgelegacy.c \
gimpoperationdodgelegacy.h \
gimpoperationscreenlegacy.c \
- gimpoperationscreenlegacy.h
+ gimpoperationscreenlegacy.h \
+ gimpoperationdifferencelegacy.c \
+ gimpoperationdifferencelegacy.h
diff --git a/app/operations/gimpoperationdifferencemode.c
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
similarity index 51%
rename from app/operations/gimpoperationdifferencemode.c
rename to app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
index 64cdfbc..7b35542 100644
--- a/app/operations/gimpoperationdifferencemode.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
@@ -23,27 +23,27 @@
#include <gegl-plugin.h>
-#include "operations-types.h"
+#include "../operations-types.h"
-#include "gimpoperationdifferencemode.h"
+#include "gimpoperationdifferencelegacy.h"
-static gboolean gimp_operation_difference_mode_process (GeglOperation *operation,
- void *in_buf,
- void *aux_buf,
- void *aux2_buf,
- void *out_buf,
- glong samples,
- const GeglRectangle *roi,
- gint level);
+static gboolean gimp_operation_difference_legacy_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *aux2_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level);
-G_DEFINE_TYPE (GimpOperationDifferenceMode, gimp_operation_difference_mode,
+G_DEFINE_TYPE (GimpOperationDifferenceLegacy, gimp_operation_difference_legacy,
GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
static void
-gimp_operation_difference_mode_class_init (GimpOperationDifferenceModeClass *klass)
+gimp_operation_difference_legacy_class_init (GimpOperationDifferenceLegacyClass *klass)
{
GeglOperationClass *operation_class;
GeglOperationPointComposer3Class *point_class;
@@ -56,38 +56,38 @@ gimp_operation_difference_mode_class_init (GimpOperationDifferenceModeClass *kla
"description", "GIMP difference mode operation",
NULL);
- point_class->process = gimp_operation_difference_mode_process;
+ point_class->process = gimp_operation_difference_legacy_process;
}
static void
-gimp_operation_difference_mode_init (GimpOperationDifferenceMode *self)
+gimp_operation_difference_legacy_init (GimpOperationDifferenceLegacy *self)
{
}
static gboolean
-gimp_operation_difference_mode_process (GeglOperation *operation,
- void *in_buf,
- void *aux_buf,
- void *aux2_buf,
- void *out_buf,
- glong samples,
- const GeglRectangle *roi,
- gint level)
+gimp_operation_difference_legacy_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *aux2_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level)
{
gfloat opacity = GIMP_OPERATION_POINT_LAYER_MODE (operation)->opacity;
- return gimp_operation_difference_mode_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity,
samples, roi, level);
+ return gimp_operation_difference_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity,
samples, roi, level);
}
gboolean
-gimp_operation_difference_mode_process_pixels (gfloat *in,
- gfloat *layer,
- gfloat *mask,
- gfloat *out,
- gfloat opacity,
- glong samples,
- const GeglRectangle *roi,
- gint level)
+gimp_operation_difference_legacy_process_pixels (gfloat *in,
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
new file mode 100644
index 0000000..3d56b7f
--- /dev/null
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -0,0 +1,62 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdifferencemode.h
+ * Copyright (C) 2008 Michael Natterer <mitch gimp org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
+#define __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
+
+
+#include "../gimpoperationpointlayermode.h"
+
+
+#define GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY (gimp_operation_difference_legacy_get_type ())
+#define GIMP_OPERATION_DIFFERENCE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacy))
+#define GIMP_OPERATION_DIFFERENCE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacyClass))
+#define GIMP_IS_OPERATION_DIFFERENCE_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY))
+#define GIMP_IS_OPERATION_DIFFERENCE_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY))
+#define GIMP_OPERATION_DIFFERENCE_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY, GimpOperationDifferenceLegacyClass))
+
+
+typedef struct _GimpOperationDifferenceLegacy GimpOperationDifferenceLegacy;
+typedef struct _GimpOperationDifferenceLegacyClass GimpOperationDifferenceLegacyClass;
+
+struct _GimpOperationDifferenceLegacy
+{
+ GimpOperationPointLayerMode parent_instance;
+};
+
+struct _GimpOperationDifferenceLegacyClass
+{
+ GimpOperationPointLayerModeClass parent_class;
+};
+
+
+GType gimp_operation_difference_legacy_get_type (void) G_GNUC_CONST;
+
+
+gboolean gimp_operation_difference_legacy_process_pixels (gfloat *in,
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level);
+
+#endif /* __GIMP_OPERATION_DIFFERENCE_LEGACY_H__ */
diff --git a/app/operations/layer-modes/Makefile.am b/app/operations/layer-modes/Makefile.am
index 1a49775..e1cbcd1 100644
--- a/app/operations/layer-modes/Makefile.am
+++ b/app/operations/layer-modes/Makefile.am
@@ -25,7 +25,9 @@ libapplayermodes_generic_a_sources = \
gimpoperationmultiply.c \
gimpoperationmultiply.h \
gimpoperationscreen.c \
- gimpoperationscreen.h
+ gimpoperationscreen.h \
+ gimpoperationdifference.c \
+ gimpoperationdifference.h
libapplayermodes_sse2_a_sources = \
gimpoperationnormal-sse2.c
diff --git a/app/operations/layer-modes/gimpoperationdifference.c
b/app/operations/layer-modes/gimpoperationdifference.c
new file mode 100644
index 0000000..fc52ca9
--- /dev/null
+++ b/app/operations/layer-modes/gimpoperationdifference.c
@@ -0,0 +1,136 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpoperationdifferencemode.c
+ * Copyright (C) 2008 Michael Natterer <mitch gimp org>
+ * 2012 Ville Sokk <ville sokk gmail com>
+ * 2017 Øyvind Kolås <pippin gimp org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl-plugin.h>
+
+#include "../operations-types.h"
+
+#include "gimpoperationdifference.h"
+
+
+static gboolean gimp_operation_difference_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *aux2_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level);
+
+
+G_DEFINE_TYPE (GimpOperationDifference, gimp_operation_difference,
+ GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
+
+
+static void
+gimp_operation_difference_class_init (GimpOperationDifferenceClass *klass)
+{
+ GeglOperationClass *operation_class;
+ GeglOperationPointComposer3Class *point_class;
+
+ operation_class = GEGL_OPERATION_CLASS (klass);
+ point_class = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
+
+ gegl_operation_class_set_keys (operation_class,
+ "name", "gimp:difference",
+ "description", "GIMP difference mode operation",
+ NULL);
+
+ point_class->process = gimp_operation_difference_process;
+}
+
+static void
+gimp_operation_difference_init (GimpOperationDifference *self)
+{
+}
+
+static gboolean
+gimp_operation_difference_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *aux2_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level)
+{
+ gfloat opacity = GIMP_OPERATION_POINT_LAYER_MODE (operation)->opacity;
+
+ return gimp_operation_difference_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity, samples,
roi, level);
+}
+
+gboolean
+gimp_operation_difference_process_pixels (gfloat *in,
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level)
+{
+ const gboolean has_mask = mask != NULL;
+
+ while (samples--)
+ {
+ gfloat comp_alpha;
+
+ comp_alpha = layer[ALPHA] * opacity;
+ if (has_mask)
+ comp_alpha *= *mask;
+
+ if (comp_alpha != 0.0f)
+ {
+ gint b;
+
+ for (b = RED; b < ALPHA; b++)
+ {
+ gfloat comp = in[b] - layer[b];
+ comp = (comp < 0) ? -comp : comp;
+
+ out[b] = comp * comp_alpha + in[b] * (1.0 - comp_alpha);
+ }
+ }
+ else
+ {
+ gint b;
+
+ for (b = RED; b < ALPHA; b++)
+ {
+ out[b] = in[b];
+ }
+ }
+
+ out[ALPHA] = in[ALPHA];
+
+ in += 4;
+ layer += 4;
+ out += 4;
+
+ if (has_mask)
+ mask++;
+ }
+
+ return TRUE;
+}
diff --git a/app/operations/gimpoperationdifferencemode.h
b/app/operations/layer-modes/gimpoperationdifference.h
similarity index 51%
rename from app/operations/gimpoperationdifferencemode.h
rename to app/operations/layer-modes/gimpoperationdifference.h
index 53ed098..3a3f0d6 100644
--- a/app/operations/gimpoperationdifferencemode.h
+++ b/app/operations/layer-modes/gimpoperationdifference.h
@@ -1,8 +1,9 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdifferencemode.h
+ * gimpoperationdifference.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
+ * 2017 Øyvind Kolås <pippin gimp org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,39 +19,39 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GIMP_OPERATION_DIFFERENCE_MODE_H__
-#define __GIMP_OPERATION_DIFFERENCE_MODE_H__
+#ifndef __GIMP_OPERATION_DIFFERENCE_H__
+#define __GIMP_OPERATION_DIFFERENCE_H__
-#include "gimpoperationpointlayermode.h"
+#include "../gimpoperationpointlayermode.h"
-#define GIMP_TYPE_OPERATION_DIFFERENCE_MODE (gimp_operation_difference_mode_get_type ())
-#define GIMP_OPERATION_DIFFERENCE_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_MODE, GimpOperationDifferenceMode))
-#define GIMP_OPERATION_DIFFERENCE_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE_MODE, GimpOperationDifferenceModeClass))
-#define GIMP_IS_OPERATION_DIFFERENCE_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_MODE))
-#define GIMP_IS_OPERATION_DIFFERENCE_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE_MODE))
-#define GIMP_OPERATION_DIFFERENCE_MODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE_MODE, GimpOperationDifferenceModeClass))
+#define GIMP_TYPE_OPERATION_DIFFERENCE (gimp_operation_difference_get_type ())
+#define GIMP_OPERATION_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE, GimpOperationDifference))
+#define GIMP_OPERATION_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE, GimpOperationDifferenceClass))
+#define GIMP_IS_OPERATION_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE))
+#define GIMP_IS_OPERATION_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GIMP_TYPE_OPERATION_DIFFERENCE))
+#define GIMP_OPERATION_DIFFERENCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GIMP_TYPE_OPERATION_DIFFERENCE, GimpOperationDifferenceClass))
-typedef struct _GimpOperationDifferenceMode GimpOperationDifferenceMode;
-typedef struct _GimpOperationDifferenceModeClass GimpOperationDifferenceModeClass;
+typedef struct _GimpOperationDifference GimpOperationDifference;
+typedef struct _GimpOperationDifferenceClass GimpOperationDifferenceClass;
-struct _GimpOperationDifferenceMode
+struct _GimpOperationDifference
{
GimpOperationPointLayerMode parent_instance;
};
-struct _GimpOperationDifferenceModeClass
+struct _GimpOperationDifferenceClass
{
GimpOperationPointLayerModeClass parent_class;
};
-GType gimp_operation_difference_mode_get_type (void) G_GNUC_CONST;
+GType gimp_operation_difference_get_type (void) G_GNUC_CONST;
-gboolean gimp_operation_difference_mode_process_pixels (gfloat *in,
+gboolean gimp_operation_difference_process_pixels (gfloat *in,
gfloat *layer,
gfloat *mask,
gfloat *out,
@@ -59,4 +60,4 @@ gboolean gimp_operation_difference_mode_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
-#endif /* __GIMP_OPERATION_DIFFERENCE_MODE_H__ */
+#endif /* __GIMP_OPERATION_DIFFERENCE_H__ */
diff --git a/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c
index 69a4f04..77f8b14 100644
--- a/app/widgets/gimpwidgets-constructors.c
+++ b/app/widgets/gimpwidgets-constructors.c
@@ -104,7 +104,7 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GtkWidget *combo;
store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE,
- 30,
+ 31,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_NON_LINEAR,
GIMP_LAYER_MODE_DISSOLVE,
@@ -126,6 +126,7 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
+ GIMP_LAYER_MODE_DIFFERENCE,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
GIMP_LAYER_MODE_SUBTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
