gimp r27251 - in trunk: . app/gegl
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27251 - in trunk: . app/gegl
- Date: Sun, 12 Oct 2008 20:26:27 +0000 (UTC)
Author: mitch
Date: Sun Oct 12 20:26:27 2008
New Revision: 27251
URL: http://svn.gnome.org/viewvc/gimp?rev=27251&view=rev
Log:
2008-10-12 Michael Natterer <mitch gimp org>
* app/gegl/gimpoperationpointcomposer.[ch]: renamed this class...
* app/gegl/gimpoperationlayermode.[ch]: ...to this and add
an own process() virtual function so we are free to hack even
more badly in order to support legacy layer modes and proper
ones which do meningfiul things to alpha. Simply redirect
GeglOperationPointComposer's compose() calls to our own vfunc
for now.
* app/gegl/gegl-types.h
* app/gegl/Makefile.am: changed accordingly.
* app/gegl/gimpoperation*mode.[ch]: changed parent class and
implemented process() method accordingly.
Added:
trunk/app/gegl/gimpoperationlayermode.c (contents, props changed)
- copied, changed from r27244, /trunk/app/gegl/gimpoperationpointcomposer.c
trunk/app/gegl/gimpoperationlayermode.h (contents, props changed)
- copied, changed from r27244, /trunk/app/gegl/gimpoperationpointcomposer.h
Removed:
trunk/app/gegl/gimpoperationpointcomposer.c
trunk/app/gegl/gimpoperationpointcomposer.h
Modified:
trunk/ChangeLog
trunk/app/gegl/Makefile.am
trunk/app/gegl/gegl-types.h
trunk/app/gegl/gimpoperationadditionmode.c
trunk/app/gegl/gimpoperationadditionmode.h
trunk/app/gegl/gimpoperationantierasemode.c
trunk/app/gegl/gimpoperationantierasemode.h
trunk/app/gegl/gimpoperationbehindmode.c
trunk/app/gegl/gimpoperationbehindmode.h
trunk/app/gegl/gimpoperationburnmode.c
trunk/app/gegl/gimpoperationburnmode.h
trunk/app/gegl/gimpoperationcolorerasemode.c
trunk/app/gegl/gimpoperationcolorerasemode.h
trunk/app/gegl/gimpoperationcolormode.c
trunk/app/gegl/gimpoperationcolormode.h
trunk/app/gegl/gimpoperationdarkenonlymode.c
trunk/app/gegl/gimpoperationdarkenonlymode.h
trunk/app/gegl/gimpoperationdifferencemode.c
trunk/app/gegl/gimpoperationdifferencemode.h
trunk/app/gegl/gimpoperationdissolvemode.c
trunk/app/gegl/gimpoperationdissolvemode.h
trunk/app/gegl/gimpoperationdividemode.c
trunk/app/gegl/gimpoperationdividemode.h
trunk/app/gegl/gimpoperationdodgemode.c
trunk/app/gegl/gimpoperationdodgemode.h
trunk/app/gegl/gimpoperationerasemode.c
trunk/app/gegl/gimpoperationerasemode.h
trunk/app/gegl/gimpoperationgrainextractmode.c
trunk/app/gegl/gimpoperationgrainextractmode.h
trunk/app/gegl/gimpoperationgrainmergemode.c
trunk/app/gegl/gimpoperationgrainmergemode.h
trunk/app/gegl/gimpoperationhardlightmode.c
trunk/app/gegl/gimpoperationhardlightmode.h
trunk/app/gegl/gimpoperationhuemode.c
trunk/app/gegl/gimpoperationhuemode.h
trunk/app/gegl/gimpoperationlightenonlymode.c
trunk/app/gegl/gimpoperationlightenonlymode.h
trunk/app/gegl/gimpoperationmultiplymode.c
trunk/app/gegl/gimpoperationmultiplymode.h
trunk/app/gegl/gimpoperationoverlaymode.c
trunk/app/gegl/gimpoperationoverlaymode.h
trunk/app/gegl/gimpoperationreplacemode.c
trunk/app/gegl/gimpoperationreplacemode.h
trunk/app/gegl/gimpoperationsaturationmode.c
trunk/app/gegl/gimpoperationsaturationmode.h
trunk/app/gegl/gimpoperationscreenmode.c
trunk/app/gegl/gimpoperationscreenmode.h
trunk/app/gegl/gimpoperationsoftlightmode.c
trunk/app/gegl/gimpoperationsoftlightmode.h
trunk/app/gegl/gimpoperationsubtractmode.c
trunk/app/gegl/gimpoperationsubtractmode.h
trunk/app/gegl/gimpoperationvaluemode.c
trunk/app/gegl/gimpoperationvaluemode.h
Modified: trunk/app/gegl/Makefile.am
==============================================================================
--- trunk/app/gegl/Makefile.am (original)
+++ trunk/app/gegl/Makefile.am Sun Oct 12 20:26:27 2008
@@ -64,8 +64,8 @@
gimpoperationthreshold.c \
gimpoperationthreshold.h \
\
- gimpoperationpointcomposer.c \
- gimpoperationpointcomposer.h \
+ gimpoperationlayermode.c \
+ gimpoperationlayermode.h \
gimpoperationdissolvemode.c \
gimpoperationdissolvemode.h \
gimpoperationbehindmode.c \
Modified: trunk/app/gegl/gegl-types.h
==============================================================================
--- trunk/app/gegl/gegl-types.h (original)
+++ trunk/app/gegl/gegl-types.h Sun Oct 12 20:26:27 2008
@@ -40,7 +40,7 @@
typedef struct _GimpOperationPosterize GimpOperationPosterize;
typedef struct _GimpOperationThreshold GimpOperationThreshold;
-typedef struct _GimpOperationPointComposer GimpOperationPointComposer;
+typedef struct _GimpOperationLayerMode GimpOperationLayerMode;
typedef struct _GimpOperationDissolveMode GimpOperationDissolveMode;
typedef struct _GimpOperationBehindMode GimpOperationBehindMode;
typedef struct _GimpOperationMultiplyMode GimpOperationMultiplyMode;
Modified: trunk/app/gegl/gimpoperationadditionmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationadditionmode.c (original)
+++ trunk/app/gegl/gimpoperationadditionmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationAdditionMode, gimp_operation_addition_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_addition_mode_class_init (GimpOperationAdditionModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-addition-mode";
operation_class->description = "GIMP addition mode operation";
- point_class->process = gimp_operation_addition_mode_process;
+ mode_class->process = gimp_operation_addition_mode_process;
}
static void
@@ -71,7 +71,7 @@
while (samples--)
{
-if 1
+#if 1
dest[RED_PIX] = src[RED_PIX] + aux[RED_PIX];
dest[GREEN_PIX] = src[GREEN_PIX] + aux[GREEN_PIX];
dest[BLUE_PIX] = src[BLUE_PIX] + aux[BLUE_PIX];
Modified: trunk/app/gegl/gimpoperationadditionmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationadditionmode.h (original)
+++ trunk/app/gegl/gimpoperationadditionmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_ADDITION_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_ADDITION_MODE (gimp_operation_addition_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationAdditionMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationAdditionModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationantierasemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationantierasemode.c (original)
+++ trunk/app/gegl/gimpoperationantierasemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationAntiEraseMode, gimp_operation_anti_erase_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_anti_erase_mode_class_init (GimpOperationAntiEraseModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-anti-erase-mode";
operation_class->description = "GIMP anti erase mode operation";
- point_class->process = gimp_operation_anti_erase_mode_process;
+ mode_class->process = gimp_operation_anti_erase_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationantierasemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationantierasemode.h (original)
+++ trunk/app/gegl/gimpoperationantierasemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_ANTI_ERASE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_ANTI_ERASE_MODE (gimp_operation_anti_erase_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationAntiEraseMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationAntiEraseModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationbehindmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationbehindmode.c (original)
+++ trunk/app/gegl/gimpoperationbehindmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationBehindMode, gimp_operation_behind_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_behind_mode_class_init (GimpOperationBehindModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-behind-mode";
operation_class->description = "GIMP behind mode operation";
- point_class->process = gimp_operation_behind_mode_process;
+ mode_class->process = gimp_operation_behind_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationbehindmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationbehindmode.h (original)
+++ trunk/app/gegl/gimpoperationbehindmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_BEHIND_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_BEHIND_MODE (gimp_operation_behind_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationBehindMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationBehindModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationburnmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationburnmode.c (original)
+++ trunk/app/gegl/gimpoperationburnmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationBurnMode, gimp_operation_burn_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_burn_mode_class_init (GimpOperationBurnModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-burn-mode";
operation_class->description = "GIMP burn mode operation";
- point_class->process = gimp_operation_burn_mode_process;
+ mode_class->process = gimp_operation_burn_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationburnmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationburnmode.h (original)
+++ trunk/app/gegl/gimpoperationburnmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_BURN_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_BURN_MODE (gimp_operation_burn_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationBurnMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationBurnModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationcolorerasemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationcolorerasemode.c (original)
+++ trunk/app/gegl/gimpoperationcolorerasemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationColorEraseMode, gimp_operation_color_erase_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_color_erase_mode_class_init (GimpOperationColorEraseModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-color-erase-mode";
operation_class->description = "GIMP color erase mode operation";
- point_class->process = gimp_operation_color_erase_mode_process;
+ mode_class->process = gimp_operation_color_erase_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationcolorerasemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationcolorerasemode.h (original)
+++ trunk/app/gegl/gimpoperationcolorerasemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_COLOR_ERASE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_COLOR_ERASE_MODE (gimp_operation_color_erase_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationColorEraseMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationColorEraseModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationcolormode.c
==============================================================================
--- trunk/app/gegl/gimpoperationcolormode.c (original)
+++ trunk/app/gegl/gimpoperationcolormode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationColorMode, gimp_operation_color_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_color_mode_class_init (GimpOperationColorModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-color-mode";
operation_class->description = "GIMP color mode operation";
- point_class->process = gimp_operation_color_mode_process;
+ mode_class->process = gimp_operation_color_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationcolormode.h
==============================================================================
--- trunk/app/gegl/gimpoperationcolormode.h (original)
+++ trunk/app/gegl/gimpoperationcolormode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_COLOR_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_COLOR_MODE (gimp_operation_color_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationColorMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationColorModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationdarkenonlymode.c
==============================================================================
--- trunk/app/gegl/gimpoperationdarkenonlymode.c (original)
+++ trunk/app/gegl/gimpoperationdarkenonlymode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationDarkenOnlyMode, gimp_operation_darken_only_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_darken_only_mode_class_init (GimpOperationDarkenOnlyModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-darken-only-mode";
operation_class->description = "GIMP darken only mode operation";
- point_class->process = gimp_operation_darken_only_mode_process;
+ mode_class->process = gimp_operation_darken_only_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationdarkenonlymode.h
==============================================================================
--- trunk/app/gegl/gimpoperationdarkenonlymode.h (original)
+++ trunk/app/gegl/gimpoperationdarkenonlymode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DARKEN_ONLY_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE (gimp_operation_darken_only_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationDarkenOnlyMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationDarkenOnlyModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationdifferencemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationdifferencemode.c (original)
+++ trunk/app/gegl/gimpoperationdifferencemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationDifferenceMode, gimp_operation_difference_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_difference_mode_class_init (GimpOperationDifferenceModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-difference-mode";
operation_class->description = "GIMP difference mode operation";
- point_class->process = gimp_operation_difference_mode_process;
+ mode_class->process = gimp_operation_difference_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationdifferencemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationdifferencemode.h (original)
+++ trunk/app/gegl/gimpoperationdifferencemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DIFFERENCE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_DIFFERENCE_MODE (gimp_operation_difference_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationDifferenceMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationDifferenceModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationdissolvemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationdissolvemode.c (original)
+++ trunk/app/gegl/gimpoperationdissolvemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationDissolveMode, gimp_operation_dissolve_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_dissolve_mode_class_init (GimpOperationDissolveModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-dissolve-mode";
operation_class->description = "GIMP dissolve mode operation";
- point_class->process = gimp_operation_dissolve_mode_process;
+ mode_class->process = gimp_operation_dissolve_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationdissolvemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationdissolvemode.h (original)
+++ trunk/app/gegl/gimpoperationdissolvemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DISSOLVE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_DISSOLVE_MODE (gimp_operation_dissolve_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationDissolveMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationDissolveModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationdividemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationdividemode.c (original)
+++ trunk/app/gegl/gimpoperationdividemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationDivideMode, gimp_operation_divide_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_divide_mode_class_init (GimpOperationDivideModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-divide-mode";
operation_class->description = "GIMP divide mode operation";
- point_class->process = gimp_operation_divide_mode_process;
+ mode_class->process = gimp_operation_divide_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationdividemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationdividemode.h (original)
+++ trunk/app/gegl/gimpoperationdividemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DIVIDE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_DIVIDE_MODE (gimp_operation_divide_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationDivideMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationDivideModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationdodgemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationdodgemode.c (original)
+++ trunk/app/gegl/gimpoperationdodgemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationDodgeMode, gimp_operation_dodge_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_dodge_mode_class_init (GimpOperationDodgeModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-dodge-mode";
operation_class->description = "GIMP dodge mode operation";
- point_class->process = gimp_operation_dodge_mode_process;
+ mode_class->process = gimp_operation_dodge_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationdodgemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationdodgemode.h (original)
+++ trunk/app/gegl/gimpoperationdodgemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DODGE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_DODGE_MODE (gimp_operation_dodge_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationDodgeMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationDodgeModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationerasemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationerasemode.c (original)
+++ trunk/app/gegl/gimpoperationerasemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationEraseMode, gimp_operation_erase_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_erase_mode_class_init (GimpOperationEraseModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-erase-mode";
operation_class->description = "GIMP erase mode operation";
- point_class->process = gimp_operation_erase_mode_process;
+ mode_class->process = gimp_operation_erase_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationerasemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationerasemode.h (original)
+++ trunk/app/gegl/gimpoperationerasemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_ERASE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_ERASE_MODE (gimp_operation_erase_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationEraseMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationEraseModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationgrainextractmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationgrainextractmode.c (original)
+++ trunk/app/gegl/gimpoperationgrainextractmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationGrainExtractMode, gimp_operation_grain_extract_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_grain_extract_mode_class_init (GimpOperationGrainExtractModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-grain-extract-mode";
operation_class->description = "GIMP grain extract mode operation";
- point_class->process = gimp_operation_grain_extract_mode_process;
+ mode_class->process = gimp_operation_grain_extract_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationgrainextractmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationgrainextractmode.h (original)
+++ trunk/app/gegl/gimpoperationgrainextractmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_GRAIN_EXTRACT_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_EXTRACT_MODE (gimp_operation_grain_extract_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationGrainExtractMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationGrainExtractModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationgrainmergemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationgrainmergemode.c (original)
+++ trunk/app/gegl/gimpoperationgrainmergemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationGrainMergeMode, gimp_operation_grain_merge_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_grain_merge_mode_class_init (GimpOperationGrainMergeModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-grain-merge-mode";
operation_class->description = "GIMP grain merge mode operation";
- point_class->process = gimp_operation_grain_merge_mode_process;
+ mode_class->process = gimp_operation_grain_merge_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationgrainmergemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationgrainmergemode.h (original)
+++ trunk/app/gegl/gimpoperationgrainmergemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_GRAIN_MERGE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_MERGE_MODE (gimp_operation_grain_merge_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationGrainMergeMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationGrainMergeModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationhardlightmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationhardlightmode.c (original)
+++ trunk/app/gegl/gimpoperationhardlightmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationHardlightMode, gimp_operation_hardlight_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_hardlight_mode_class_init (GimpOperationHardlightModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-hardlight-mode";
operation_class->description = "GIMP hardlight mode operation";
- point_class->process = gimp_operation_hardlight_mode_process;
+ mode_class->process = gimp_operation_hardlight_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationhardlightmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationhardlightmode.h (original)
+++ trunk/app/gegl/gimpoperationhardlightmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_HARDLIGHT_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_HARDLIGHT_MODE (gimp_operation_hardlight_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationHardlightMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationHardlightModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationhuemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationhuemode.c (original)
+++ trunk/app/gegl/gimpoperationhuemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationHueMode, gimp_operation_hue_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_hue_mode_class_init (GimpOperationHueModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-hue-mode";
operation_class->description = "GIMP hue mode operation";
- point_class->process = gimp_operation_hue_mode_process;
+ mode_class->process = gimp_operation_hue_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationhuemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationhuemode.h (original)
+++ trunk/app/gegl/gimpoperationhuemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_HUE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_HUE_MODE (gimp_operation_hue_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationHueMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationHueModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Copied: trunk/app/gegl/gimpoperationlayermode.c (from r27244, /trunk/app/gegl/gimpoperationpointcomposer.c)
==============================================================================
--- /trunk/app/gegl/gimpoperationpointcomposer.c (original)
+++ trunk/app/gegl/gimpoperationlayermode.c Sun Oct 12 20:26:27 2008
@@ -25,22 +25,49 @@
#include "gegl-types.h"
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
-G_DEFINE_ABSTRACT_TYPE (GimpOperationPointComposer, gimp_operation_point_composer,
+static gboolean gimp_operation_layer_mode_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi);
+
+
+G_DEFINE_ABSTRACT_TYPE (GimpOperationLayerMode, gimp_operation_layer_mode,
GEGL_TYPE_OPERATION_POINT_COMPOSER)
static void
-gimp_operation_point_composer_class_init (GimpOperationPointComposerClass *klass)
+gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
operation_class->categories = "compositors";
+
+ point_class->process = gimp_operation_layer_mode_process;
}
static void
-gimp_operation_point_composer_init (GimpOperationPointComposer *self)
+gimp_operation_layer_mode_init (GimpOperationLayerMode *self)
+{
+}
+
+static gboolean
+gimp_operation_layer_mode_process (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi)
{
+ return GIMP_OPERATION_LAYER_MODE_GET_CLASS (operation)->process (operation,
+ in_buf,
+ aux_buf,
+ out_buf,
+ samples,
+ roi);
}
Copied: trunk/app/gegl/gimpoperationlayermode.h (from r27244, /trunk/app/gegl/gimpoperationpointcomposer.h)
==============================================================================
--- /trunk/app/gegl/gimpoperationpointcomposer.h (original)
+++ trunk/app/gegl/gimpoperationlayermode.h Sun Oct 12 20:26:27 2008
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationpointcomposer.h
+ * gimpoperationlayermode.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software; you can redistribute it and/or modify
@@ -19,36 +19,43 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __GIMP_OPERATION_POINT_COMPOSER_H__
-#define __GIMP_OPERATION_POINT_COMPOSER_H__
+#ifndef __GIMP_OPERATION_LAYER_MODE_H__
+#define __GIMP_OPERATION_LAYER_MODE_H__
#include <gegl-plugin.h>
#include <operation/gegl-operation-point-composer.h>
-#define GIMP_TYPE_OPERATION_POINT_COMPOSER (gimp_operation_point_composer_get_type ())
-#define GIMP_OPERATION_POINT_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_POINT_COMPOSER, GimpOperationPointComposer))
-#define GIMP_OPERATION_POINT_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_POINT_COMPOSER, GimpOperationPointComposerClass))
-#define GIMP_IS_OPERATION_POINT_COMPOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_POINT_COMPOSER))
-#define GIMP_IS_OPERATION_POINT_COMPOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_POINT_COMPOSER))
-#define GIMP_OPERATION_POINT_COMPOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_POINT_COMPOSER, GimpOperationPointComposerClass))
+#define GIMP_TYPE_OPERATION_LAYER_MODE (gimp_operation_layer_mode_get_type ())
+#define GIMP_OPERATION_LAYER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerMode))
+#define GIMP_OPERATION_LAYER_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerModeClass))
+#define GIMP_IS_OPERATION_LAYER_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_LAYER_MODE))
+#define GIMP_IS_OPERATION_LAYER_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_LAYER_MODE))
+#define GIMP_OPERATION_LAYER_MODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_LAYER_MODE, GimpOperationLayerModeClass))
-typedef struct _GimpOperationPointComposerClass GimpOperationPointComposerClass;
+typedef struct _GimpOperationLayerModeClass GimpOperationLayerModeClass;
-struct _GimpOperationPointComposer
+struct _GimpOperationLayerMode
{
GeglOperationPointComposer parent_instance;
};
-struct _GimpOperationPointComposerClass
+struct _GimpOperationLayerModeClass
{
GeglOperationPointComposerClass parent_class;
+
+ gboolean (* process) (GeglOperation *operation,
+ void *in_buf,
+ void *aux_buf,
+ void *out_buf,
+ glong samples,
+ const GeglRectangle *roi);
};
-GType gimp_operation_point_composer_get_type (void) G_GNUC_CONST;
+GType gimp_operation_layer_mode_get_type (void) G_GNUC_CONST;
-#endif /* __GIMP_OPERATION_POINT_COMPOSER_H__ */
+#endif /* __GIMP_OPERATION_LAYER_MODE_H__ */
Modified: trunk/app/gegl/gimpoperationlightenonlymode.c
==============================================================================
--- trunk/app/gegl/gimpoperationlightenonlymode.c (original)
+++ trunk/app/gegl/gimpoperationlightenonlymode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationLightenOnlyMode, gimp_operation_lighten_only_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_lighten_only_mode_class_init (GimpOperationLightenOnlyModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-lighten-only-mode";
operation_class->description = "GIMP lighten only mode operation";
- point_class->process = gimp_operation_lighten_only_mode_process;
+ mode_class->process = gimp_operation_lighten_only_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationlightenonlymode.h
==============================================================================
--- trunk/app/gegl/gimpoperationlightenonlymode.h (original)
+++ trunk/app/gegl/gimpoperationlightenonlymode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_LIGHTEN_ONLY_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_LIGHTEN_ONLY_MODE (gimp_operation_lighten_only_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationLightenOnlyMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationLightenOnlyModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationmultiplymode.c
==============================================================================
--- trunk/app/gegl/gimpoperationmultiplymode.c (original)
+++ trunk/app/gegl/gimpoperationmultiplymode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationMultiplyMode, gimp_operation_multiply_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_multiply_mode_class_init (GimpOperationMultiplyModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-multiply-mode";
operation_class->description = "GIMP multiply mode operation";
- point_class->process = gimp_operation_multiply_mode_process;
+ mode_class->process = gimp_operation_multiply_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationmultiplymode.h
==============================================================================
--- trunk/app/gegl/gimpoperationmultiplymode.h (original)
+++ trunk/app/gegl/gimpoperationmultiplymode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_MULTIPLY_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_MULTIPLY_MODE (gimp_operation_multiply_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationMultiplyMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationMultiplyModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationoverlaymode.c
==============================================================================
--- trunk/app/gegl/gimpoperationoverlaymode.c (original)
+++ trunk/app/gegl/gimpoperationoverlaymode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationOverlayMode, gimp_operation_overlay_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_overlay_mode_class_init (GimpOperationOverlayModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-overlay-mode";
operation_class->description = "GIMP overlay mode operation";
- point_class->process = gimp_operation_overlay_mode_process;
+ mode_class->process = gimp_operation_overlay_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationoverlaymode.h
==============================================================================
--- trunk/app/gegl/gimpoperationoverlaymode.h (original)
+++ trunk/app/gegl/gimpoperationoverlaymode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_OVERLAY_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_OVERLAY_MODE (gimp_operation_overlay_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationOverlayMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationOverlayModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationreplacemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationreplacemode.c (original)
+++ trunk/app/gegl/gimpoperationreplacemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationReplaceMode, gimp_operation_replace_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_replace_mode_class_init (GimpOperationReplaceModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-replace-mode";
operation_class->description = "GIMP replace mode operation";
- point_class->process = gimp_operation_replace_mode_process;
+ mode_class->process = gimp_operation_replace_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationreplacemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationreplacemode.h (original)
+++ trunk/app/gegl/gimpoperationreplacemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_REPLACE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_REPLACE_MODE (gimp_operation_replace_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationReplaceMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationReplaceModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationsaturationmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationsaturationmode.c (original)
+++ trunk/app/gegl/gimpoperationsaturationmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationSaturationMode, gimp_operation_saturation_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_saturation_mode_class_init (GimpOperationSaturationModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-saturation-mode";
operation_class->description = "GIMP saturation mode operation";
- point_class->process = gimp_operation_saturation_mode_process;
+ mode_class->process = gimp_operation_saturation_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationsaturationmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationsaturationmode.h (original)
+++ trunk/app/gegl/gimpoperationsaturationmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_SATURATION_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_SATURATION_MODE (gimp_operation_saturation_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationSaturationMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationSaturationModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationscreenmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationscreenmode.c (original)
+++ trunk/app/gegl/gimpoperationscreenmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationScreenMode, gimp_operation_screen_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_screen_mode_class_init (GimpOperationScreenModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-screen-mode";
operation_class->description = "GIMP screen mode operation";
- point_class->process = gimp_operation_screen_mode_process;
+ mode_class->process = gimp_operation_screen_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationscreenmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationscreenmode.h (original)
+++ trunk/app/gegl/gimpoperationscreenmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_SCREEN_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_SCREEN_MODE (gimp_operation_screen_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationScreenMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationScreenModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationsoftlightmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationsoftlightmode.c (original)
+++ trunk/app/gegl/gimpoperationsoftlightmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationSoftlightMode, gimp_operation_softlight_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_softlight_mode_class_init (GimpOperationSoftlightModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-softlight-mode";
operation_class->description = "GIMP softlight mode operation";
- point_class->process = gimp_operation_softlight_mode_process;
+ mode_class->process = gimp_operation_softlight_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationsoftlightmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationsoftlightmode.h (original)
+++ trunk/app/gegl/gimpoperationsoftlightmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_SOFTLIGHT_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_SOFTLIGHT_MODE (gimp_operation_softlight_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationSoftlightMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationSoftlightModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationsubtractmode.c
==============================================================================
--- trunk/app/gegl/gimpoperationsubtractmode.c (original)
+++ trunk/app/gegl/gimpoperationsubtractmode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationSubtractMode, gimp_operation_subtract_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_subtract_mode_class_init (GimpOperationSubtractModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-subtract-mode";
operation_class->description = "GIMP subtract mode operation";
- point_class->process = gimp_operation_subtract_mode_process;
+ mode_class->process = gimp_operation_subtract_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationsubtractmode.h
==============================================================================
--- trunk/app/gegl/gimpoperationsubtractmode.h (original)
+++ trunk/app/gegl/gimpoperationsubtractmode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_SUBTRACT_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_SUBTRACT_MODE (gimp_operation_subtract_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationSubtractMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationSubtractModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
Modified: trunk/app/gegl/gimpoperationvaluemode.c
==============================================================================
--- trunk/app/gegl/gimpoperationvaluemode.c (original)
+++ trunk/app/gegl/gimpoperationvaluemode.c Sun Oct 12 20:26:27 2008
@@ -37,19 +37,19 @@
G_DEFINE_TYPE (GimpOperationValueMode, gimp_operation_value_mode,
- GIMP_TYPE_OPERATION_POINT_COMPOSER)
+ GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_value_mode_class_init (GimpOperationValueModeClass *klass)
{
- GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
- GeglOperationPointComposerClass *point_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+ GeglOperationClass *operation_class = GEGL_OPERATION_CLASS (klass);
+ GimpOperationLayerModeClass *mode_class = GIMP_OPERATION_LAYER_MODE_CLASS (klass);
operation_class->name = "gimp-value-mode";
operation_class->description = "GIMP value mode operation";
- point_class->process = gimp_operation_value_mode_process;
+ mode_class->process = gimp_operation_value_mode_process;
}
static void
Modified: trunk/app/gegl/gimpoperationvaluemode.h
==============================================================================
--- trunk/app/gegl/gimpoperationvaluemode.h (original)
+++ trunk/app/gegl/gimpoperationvaluemode.h Sun Oct 12 20:26:27 2008
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_VALUE_MODE_H__
-#include "gimpoperationpointcomposer.h"
+#include "gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_VALUE_MODE (gimp_operation_value_mode_get_type ())
@@ -38,12 +38,12 @@
struct _GimpOperationValueMode
{
- GimpOperationPointComposer parent_instance;
+ GimpOperationLayerMode parent_instance;
};
struct _GimpOperationValueModeClass
{
- GimpOperationPointComposerClass parent_class;
+ GimpOperationLayerModeClass parent_class;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
