[gimp] app: some cleanup and adding const in gimp-layer-modes.c
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: some cleanup and adding const in gimp-layer-modes.c
- Date: Sun, 5 Feb 2017 15:31:24 +0000 (UTC)
commit a3b8d0ceed39dddc7c5d12ec94ea55331b92d865
Author: Michael Natterer <mitch gimp org>
Date: Sun Feb 5 16:30:54 2017 +0100
app: some cleanup and adding const in gimp-layer-modes.c
app/operations/layer-modes/gimp-layer-modes.c | 108 +++++++++----------------
1 files changed, 37 insertions(+), 71 deletions(-)
---
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 40f457b..503eaab 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -33,7 +33,7 @@ typedef struct _GimpLayerModeInfo GimpLayerModeInfo;
struct _GimpLayerModeInfo
{
GimpLayerMode layer_mode;
- gchar *op_name;
+ const gchar *op_name;
GimpLayerModeFlags flags;
GimpLayerCompositeMode composite_mode;
GimpLayerColorSpace composite_space;
@@ -43,7 +43,7 @@ struct _GimpLayerModeInfo
/* static variables */
-static GimpLayerModeInfo layer_mode_infos[]=
+static const GimpLayerModeInfo layer_mode_infos[]=
{
{ GIMP_LAYER_MODE_NORMAL,
"gimp:normal",
@@ -774,243 +774,209 @@ static const GimpLayerMode layer_mode_group_legacy[] =
static const GimpLayerMode layer_mode_groups[][4] =
{
- {
- GIMP_LAYER_MODE_NORMAL,
+ { GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL_LINEAR,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_NORMAL
},
- {
- GIMP_LAYER_MODE_DISSOLVE,
+ { GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_DISSOLVE
},
- {
- GIMP_LAYER_MODE_BEHIND,
+ { GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_BEHIND_LINEAR,
GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_BEHIND
},
- {
- GIMP_LAYER_MODE_MULTIPLY,
+ { GIMP_LAYER_MODE_MULTIPLY,
GIMP_LAYER_MODE_MULTIPLY_LINEAR,
GIMP_LAYER_MODE_MULTIPLY,
GIMP_LAYER_MODE_MULTIPLY_LEGACY
},
- {
- GIMP_LAYER_MODE_SCREEN,
+ { GIMP_LAYER_MODE_SCREEN,
GIMP_LAYER_MODE_SCREEN_LINEAR,
GIMP_LAYER_MODE_SCREEN,
GIMP_LAYER_MODE_SCREEN_LEGACY
},
- {
- GIMP_LAYER_MODE_OVERLAY,
+ { GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_OVERLAY_LINEAR,
GIMP_LAYER_MODE_OVERLAY,
-1
},
- {
- GIMP_LAYER_MODE_DIFFERENCE,
+ { GIMP_LAYER_MODE_DIFFERENCE,
GIMP_LAYER_MODE_DIFFERENCE_LINEAR,
GIMP_LAYER_MODE_DIFFERENCE,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY
},
- {
- GIMP_LAYER_MODE_ADDITION,
+ { GIMP_LAYER_MODE_ADDITION,
GIMP_LAYER_MODE_ADDITION_LINEAR,
GIMP_LAYER_MODE_ADDITION,
GIMP_LAYER_MODE_ADDITION_LEGACY
},
- {
- GIMP_LAYER_MODE_SUBTRACT,
+ { GIMP_LAYER_MODE_SUBTRACT,
GIMP_LAYER_MODE_SUBTRACT_LINEAR,
GIMP_LAYER_MODE_SUBTRACT,
GIMP_LAYER_MODE_SUBTRACT_LEGACY
},
- {
- GIMP_LAYER_MODE_DARKEN_ONLY,
+ { GIMP_LAYER_MODE_DARKEN_ONLY,
GIMP_LAYER_MODE_DARKEN_ONLY,
GIMP_LAYER_MODE_DARKEN_ONLY,
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY
},
- {
- GIMP_LAYER_MODE_LIGHTEN_ONLY,
+ { GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
},
- {
- -1,
+ { -1,
-1,
GIMP_LAYER_MODE_HSV_HUE,
GIMP_LAYER_MODE_HSV_HUE_LEGACY
},
- {
- -1,
+ { -1,
-1,
GIMP_LAYER_MODE_HSV_SATURATION,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
},
- {
- -1,
+ { -1,
-1,
GIMP_LAYER_MODE_HSV_COLOR,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY
},
- {
- -1,
+ { -1,
-1,
GIMP_LAYER_MODE_HSV_VALUE,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY
},
- {
- GIMP_LAYER_MODE_DIVIDE,
+ { GIMP_LAYER_MODE_DIVIDE,
GIMP_LAYER_MODE_DIVIDE_LINEAR,
GIMP_LAYER_MODE_DIVIDE,
GIMP_LAYER_MODE_DIVIDE_LEGACY
},
- {
- GIMP_LAYER_MODE_DODGE,
+ { GIMP_LAYER_MODE_DODGE,
GIMP_LAYER_MODE_DODGE_LINEAR,
GIMP_LAYER_MODE_DODGE,
GIMP_LAYER_MODE_DODGE_LEGACY
},
- {
- GIMP_LAYER_MODE_BURN,
+ { GIMP_LAYER_MODE_BURN,
GIMP_LAYER_MODE_BURN_LINEAR,
GIMP_LAYER_MODE_BURN,
GIMP_LAYER_MODE_BURN_LEGACY
},
- {
- GIMP_LAYER_MODE_HARDLIGHT,
+ { GIMP_LAYER_MODE_HARDLIGHT,
GIMP_LAYER_MODE_HARDLIGHT_LINEAR,
GIMP_LAYER_MODE_HARDLIGHT,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY
},
- {
- GIMP_LAYER_MODE_SOFTLIGHT,
+ { GIMP_LAYER_MODE_SOFTLIGHT,
GIMP_LAYER_MODE_SOFTLIGHT_LINEAR,
GIMP_LAYER_MODE_SOFTLIGHT,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY
},
- {
- GIMP_LAYER_MODE_GRAIN_EXTRACT,
+ { GIMP_LAYER_MODE_GRAIN_EXTRACT,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LINEAR,
GIMP_LAYER_MODE_GRAIN_EXTRACT,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY
},
- {
- GIMP_LAYER_MODE_GRAIN_MERGE,
+ { GIMP_LAYER_MODE_GRAIN_MERGE,
GIMP_LAYER_MODE_GRAIN_MERGE_LINEAR,
GIMP_LAYER_MODE_GRAIN_MERGE,
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY
},
- {
- GIMP_LAYER_MODE_COLOR_ERASE,
+ { GIMP_LAYER_MODE_COLOR_ERASE,
-1,
GIMP_LAYER_MODE_COLOR_ERASE,
-1,
},
- {
- GIMP_LAYER_MODE_VIVID_LIGHT,
+ { GIMP_LAYER_MODE_VIVID_LIGHT,
GIMP_LAYER_MODE_VIVID_LIGHT_LINEAR,
GIMP_LAYER_MODE_VIVID_LIGHT,
-1
},
- {
- GIMP_LAYER_MODE_PIN_LIGHT,
+ { GIMP_LAYER_MODE_PIN_LIGHT,
GIMP_LAYER_MODE_PIN_LIGHT_LINEAR,
GIMP_LAYER_MODE_PIN_LIGHT,
-1
},
- {
- GIMP_LAYER_MODE_LINEAR_LIGHT,
+ { GIMP_LAYER_MODE_LINEAR_LIGHT,
GIMP_LAYER_MODE_LINEAR_LIGHT_LINEAR,
GIMP_LAYER_MODE_LINEAR_LIGHT,
-1
},
- {
- GIMP_LAYER_MODE_HARD_MIX,
+ { GIMP_LAYER_MODE_HARD_MIX,
GIMP_LAYER_MODE_HARD_MIX_LINEAR,
GIMP_LAYER_MODE_HARD_MIX,
-1
},
- {
- GIMP_LAYER_MODE_EXCLUSION,
+ { GIMP_LAYER_MODE_EXCLUSION,
GIMP_LAYER_MODE_EXCLUSION_LINEAR,
GIMP_LAYER_MODE_EXCLUSION,
-1
},
- {
- GIMP_LAYER_MODE_LINEAR_BURN,
+ { GIMP_LAYER_MODE_LINEAR_BURN,
GIMP_LAYER_MODE_LINEAR_BURN_LINEAR,
GIMP_LAYER_MODE_LINEAR_BURN,
-1
},
- {
- GIMP_LAYER_MODE_LUMINANCE_DARKEN_ONLY,
+ { GIMP_LAYER_MODE_LUMINANCE_DARKEN_ONLY,
GIMP_LAYER_MODE_LUMINANCE_DARKEN_ONLY,
GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,
-1
},
- {
- GIMP_LAYER_MODE_LUMINANCE_LIGHTEN_ONLY,
+ { GIMP_LAYER_MODE_LUMINANCE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LUMINANCE_LIGHTEN_ONLY,
GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,
-1
},
- {
- GIMP_LAYER_MODE_ERASE,
+ { GIMP_LAYER_MODE_ERASE,
GIMP_LAYER_MODE_ERASE,
-1,
-1
},
- {
- GIMP_LAYER_MODE_REPLACE,
+ { GIMP_LAYER_MODE_REPLACE,
GIMP_LAYER_MODE_REPLACE,
-1,
-1
},
- {
- GIMP_LAYER_MODE_ANTI_ERASE,
+ { GIMP_LAYER_MODE_ANTI_ERASE,
GIMP_LAYER_MODE_ANTI_ERASE,
-1,
-1
- },
+ }
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]