[gimp/pippin/linear-is-the-new-black: 10/10] app: complete function returning layer modes

[Øyvind Kolås <ok src gnome org>]

commit 6358b815bba010100caec9b8a7842a1c0e91a680
Author: Øyvind Kolås <pippin gimp org>
Date:   Mon Jan 23 16:48:42 2017 +0100

    app: complete function returning layer modes

 app/core/gimp-layer-modes.c                        |   13 -------------
 .../layer-modes/gimpoperationlayermode.c           |   11 ++++++++++-
 2 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/app/core/gimp-layer-modes.c b/app/core/gimp-layer-modes.c
index 0726502..f93d30d 100644
--- a/app/core/gimp-layer-modes.c
+++ b/app/core/gimp-layer-modes.c
@@ -433,21 +433,12 @@ gimp_layer_mode_get_operation (GimpLayerMode  mode)
     case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
       return "gimp:hsv-saturation-legacy";
 
-    case GIMP_LAYER_MODE_HSV_SATURATION:
-      return "gimp:hsv-saturation";
-
     case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
       return "gimp:hsv-color-legacy";
 
-    case GIMP_LAYER_MODE_HSV_COLOR:
-      return "gimp:hsv-color";
-
     case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
       return "gimp:hsv-value-legacy";
 
-    case GIMP_LAYER_MODE_HSV_VALUE:
-      return "gimp:hsv-value";
-
     case GIMP_LAYER_MODE_DIVIDE_LEGACY:
       return "gimp:divide-legacy";
 
@@ -466,10 +457,6 @@ gimp_layer_mode_get_operation (GimpLayerMode  mode)
     case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
       return "gimp:grain-extract-legacy";
 
-    case GIMP_LAYER_MODE_GRAIN_EXTRACT:
-    case GIMP_LAYER_MODE_GRAIN_EXTRACT_LINEAR:
-      return "gimp:grain-extract";
-
     case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
       return "gimp:grain-merge-legacy";
 
diff --git a/app/operations/layer-modes/gimpoperationlayermode.c 
b/app/operations/layer-modes/gimpoperationlayermode.c
index c7676fc..c17c882 100644
--- a/app/operations/layer-modes/gimpoperationlayermode.c
+++ b/app/operations/layer-modes/gimpoperationlayermode.c
@@ -294,11 +294,16 @@ static inline GimpBlendFunc gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
 {
   switch (mode)
   {
+    case GIMP_LAYER_MODE_SCREEN_LINEAR:
     case GIMP_LAYER_MODE_SCREEN:         return blendfun_screen;
+    case GIMP_LAYER_MODE_ADDITION_LINEAR:
     case GIMP_LAYER_MODE_ADDITION:       return blendfun_addition;
+    case GIMP_LAYER_MODE_SUBTRACT_LINEAR:
     case GIMP_LAYER_MODE_SUBTRACT:       return blendfun_subtract;
+    case GIMP_LAYER_MODE_MULTIPLY_LINEAR:
     case GIMP_LAYER_MODE_MULTIPLY:       return blendfun_multiply;
     case GIMP_LAYER_MODE_NORMAL:         return blendfun_normal;
+    case GIMP_LAYER_MODE_BURN_LINEAR:
     case GIMP_LAYER_MODE_BURN:           return blendfun_burn;
     case GIMP_LAYER_MODE_GRAIN_MERGE_LINEAR:
     case GIMP_LAYER_MODE_GRAIN_MERGE:    return blendfun_grain_merge;
@@ -306,6 +311,7 @@ static inline GimpBlendFunc gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
     case GIMP_LAYER_MODE_GRAIN_EXTRACT:  return blendfun_grain_merge;
     case GIMP_LAYER_MODE_DODGE_LINEAR: 
     case GIMP_LAYER_MODE_DODGE:          return blendfun_dodge;
+    case GIMP_LAYER_MODE_OVERLAY_LINEAR:
     case GIMP_LAYER_MODE_OVERLAY:        return blendfun_overlay;
     case GIMP_LAYER_MODE_HSV_COLOR:      return blendfun_hsv_color;
     case GIMP_LAYER_MODE_HSV_HUE:        return blendfun_hsv_hue;
@@ -315,10 +321,13 @@ static inline GimpBlendFunc gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
     case GIMP_LAYER_MODE_LCH_COLOR:      return blendfun_lch_color;
     case GIMP_LAYER_MODE_LCH_HUE:        return blendfun_lch_hue;
     case GIMP_LAYER_MODE_LCH_LIGHTNESS:  return blendfun_lch_lightness;
+    case GIMP_LAYER_MODE_HARDLIGHT_LINEAR:
     case GIMP_LAYER_MODE_HARDLIGHT:      return blendfun_hardlight;
+    case GIMP_LAYER_MODE_SOFTLIGHT_LINEAR:
     case GIMP_LAYER_MODE_SOFTLIGHT:      return blendfun_softlight;
-    case GIMP_LAYER_MODE_DIVIDE:         return blendfun_divide;
+    case GIMP_LAYER_MODE_DIVIDE:
     case GIMP_LAYER_MODE_DIVIDE_LINEAR:  return blendfun_divide;
+    case GIMP_LAYER_MODE_DIFFERENCE_LINEAR: 
     case GIMP_LAYER_MODE_DIFFERENCE:     return blendfun_difference;
     case GIMP_LAYER_MODE_DARKEN_ONLY:    return blendfun_darken_only;
     case GIMP_LAYER_MODE_LIGHTEN_ONLY:   return blendfun_lighten_only;