callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: layer op fission cleanup

Browse Source
This commit is contained in:
Øyvind Kolås
2017-01-09 23:56:45 +01:00
parent b001626b31
commit 92047ea949
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/operations/gimp-operations.c
View File

@ -74,7 +74,8 @@
#include "layer-modes/gimpoperationscreen.h"
#include "layer-modes-legacy/gimpoperationscreenlegacy.h"
#include "layer-modes/gimpoperationoverlay.h"
#include "gimpoperationdifferencemode.h"
#include "layer-modes/gimpoperationdifference.h"
#include "layer-modes-legacy/gimpoperationdifferencelegacy.h"
#include "gimpoperationadditionmode.h"
#include "gimpoperationsubtractmode.h"
#include "gimpoperationdarkenonlymode.h"
@ -138,9 +139,11 @@ gimp_operations_init (void)
g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY);
g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN);
g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_OVERLAY);
g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE);
g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_ADDITION_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_SUBTRACT_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE);

9
app/operations/gimplayermodefunctions.c
View File

@ -34,7 +34,8 @@
#include "layer-modes/gimpoperationscreen.h"
#include "layer-modes-legacy/gimpoperationscreenlegacy.h"
#include "layer-modes/gimpoperationoverlay.h"
#include "gimpoperationdifferencemode.h"
#include "layer-modes/gimpoperationdifference.h"
#include "layer-modes-legacy/gimpoperationdifferencelegacy.h"
#include "gimpoperationadditionmode.h"
#include "gimpoperationsubtractmode.h"
#include "gimpoperationdarkenonlymode.h"
@ -102,7 +103,11 @@ get_layer_mode_function (GimpLayerMode paint_mode,
break;
case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
func = gimp_operation_difference_mode_process_pixels;
func = gimp_operation_difference_legacy_process_pixels;
break;
case GIMP_LAYER_MODE_DIFFERENCE:
func = gimp_operation_difference_process_pixels;
break;
case GIMP_LAYER_MODE_ADDITION_LEGACY:

12
app/operations/layer-modes/gimpoperationscreen.h
View File

@ -25,12 +25,12 @@
#include "../gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SCREEN_MODE (gimp_operation_screen_get_type ())
#define GIMP_OPERATION_SCREEN_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SCREEN_MODE, GimpOperationScreen))
#define GIMP_OPERATION_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_SCREEN_MODE, GimpOperationScreenClass))
#define GIMP_IS_OPERATION_SCREEN_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SCREEN_MODE))
#define GIMP_IS_OPERATION_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_SCREEN_MODE))
#define GIMP_OPERATION_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_SCREEN_MODE, GimpOperationScreenClass))
#define GIMP_TYPE_OPERATION_SCREEN (gimp_operation_screen_get_type ())
#define GIMP_OPERATION_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_SCREEN, GimpOperationScreen))
#define GIMP_OPERATION_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_SCREEN, GimpOperationScreenClass))
#define GIMP_IS_OPERATION_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_SCREEN))
#define GIMP_IS_OPERATION_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_SCREEN))
#define GIMP_OPERATION_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_SCREEN, GimpOperationScreenClass))
typedef struct _GimpOperationScreen GimpOperationScreen;

6
tools/pdbgen/enums.pl
View File

@ -723,7 +723,8 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LCH_LIGHTNESS
GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_MULTIPLY
GIMP_LAYER_MODE_MULTIPLY_LINEAR
GIMP_LAYER_MODE_DODGE GIMP_LAYER_MODE_SCREEN) ],
GIMP_LAYER_MODE_DODGE GIMP_LAYER_MODE_SCREEN
GIMP_LAYER_MODE_DIFFERENCE) ],
mapping => { GIMP_LAYER_MODE_NORMAL_NON_LINEAR => '0',
GIMP_LAYER_MODE_DISSOLVE => '1',
GIMP_LAYER_MODE_BEHIND => '2',
@ -756,7 +757,8 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_MULTIPLY => '29',
GIMP_LAYER_MODE_MULTIPLY_LINEAR => '30',
GIMP_LAYER_MODE_DODGE => '31',
GIMP_LAYER_MODE_SCREEN => '32' }
GIMP_LAYER_MODE_SCREEN => '32',
GIMP_LAYER_MODE_DIFFERENCE => '33' }
},
GimpBrushApplicationMode =>
{ contig => 1,