[gimp] app: rename "Color (HSV)" mode to "Color (HSL)"

[N/A <ell src gnome org>]

commit 661c22c06fe6b20decb5b9fccce51e7176cd8dd5
Author: Ell <ell_se yahoo com>
Date:   Wed Mar 15 19:30:01 2017 -0400

    app: rename "Color (HSV)" mode to "Color (HSL)"
    
    ... since that's the color space it actually works in.
    
    Keep the legacy "Color (HSV)" mode's name as is, wrong as it is,
    since, well, that's what it used to be called...

 app/core/gimpimage.c                               |    2 +-
 app/operations/layer-modes/gimp-layer-modes.c      |    7 ++++---
 .../layer-modes/gimpoperationlayermode.c           |    4 ++--
 app/operations/operations-enums.c                  |    4 ++--
 app/operations/operations-enums.h                  |    2 +-
 libgimp/gimpenums.h                                |    2 +-
 tools/pdbgen/enums.pl                              |    4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index f9cedd6..21f56a9 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -2444,7 +2444,7 @@ gimp_image_get_xcf_version (GimpImage    *image,
         case GIMP_LAYER_MODE_LIGHTEN_ONLY:
         case GIMP_LAYER_MODE_HSV_HUE:
         case GIMP_LAYER_MODE_HSV_SATURATION:
-        case GIMP_LAYER_MODE_HSV_COLOR:
+        case GIMP_LAYER_MODE_HSL_COLOR:
         case GIMP_LAYER_MODE_HSV_VALUE:
         case GIMP_LAYER_MODE_DIVIDE:
         case GIMP_LAYER_MODE_DODGE:
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 7aa0e5b..5e84ba4 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -602,7 +602,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
   },
 
-  { GIMP_LAYER_MODE_HSV_COLOR,
+  { GIMP_LAYER_MODE_HSL_COLOR,
 
     .op_name              = "gimp:layer-mode",
     .function             = gimp_operation_layer_mode_process_pixels,
@@ -922,7 +922,7 @@ static const GimpLayerMode layer_mode_group_default[] =
 
   GIMP_LAYER_MODE_HSV_HUE,
   GIMP_LAYER_MODE_HSV_SATURATION,
-  GIMP_LAYER_MODE_HSV_COLOR,
+  GIMP_LAYER_MODE_HSL_COLOR,
   GIMP_LAYER_MODE_HSV_VALUE,
 
   GIMP_LAYER_MODE_SEPARATOR,
@@ -1035,8 +1035,9 @@ static const GimpLayerMode layer_mode_groups[][2] =
     [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
   },
 
-  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_COLOR,
+  { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSL_COLOR,
     [GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_COLOR_LEGACY
+                                      /* HSV_COLOR_LEGACY actually uses HSL */
   },
 
   { [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_VALUE,
diff --git a/app/operations/layer-modes/gimpoperationlayermode.c 
b/app/operations/layer-modes/gimpoperationlayermode.c
index fa8484d..bbfb0cc 100644
--- a/app/operations/layer-modes/gimpoperationlayermode.c
+++ b/app/operations/layer-modes/gimpoperationlayermode.c
@@ -1799,7 +1799,7 @@ blendfun_overlay (const float *dest,
 }
 
 static inline void
-blendfun_hsv_color (const float *dest,
+blendfun_hsl_color (const float *dest,
                     const float *src,
                     float       *out,
                     int          samples)
@@ -2441,7 +2441,7 @@ gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
     case GIMP_LAYER_MODE_GRAIN_EXTRACT:  return blendfun_grain_extract;
     case GIMP_LAYER_MODE_DODGE:          return blendfun_dodge;
     case GIMP_LAYER_MODE_OVERLAY:        return blendfun_overlay;
-    case GIMP_LAYER_MODE_HSV_COLOR:      return blendfun_hsv_color;
+    case GIMP_LAYER_MODE_HSL_COLOR:      return blendfun_hsl_color;
     case GIMP_LAYER_MODE_HSV_HUE:        return blendfun_hsv_hue;
     case GIMP_LAYER_MODE_HSV_SATURATION: return blendfun_hsv_saturation;
     case GIMP_LAYER_MODE_HSV_VALUE:      return blendfun_hsv_value;
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index 766c464..493038f 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -120,7 +120,7 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LIGHTEN_ONLY, "GIMP_LAYER_MODE_LIGHTEN_ONLY", "lighten-only" },
     { GIMP_LAYER_MODE_HSV_HUE, "GIMP_LAYER_MODE_HSV_HUE", "hsv-hue" },
     { GIMP_LAYER_MODE_HSV_SATURATION, "GIMP_LAYER_MODE_HSV_SATURATION", "hsv-saturation" },
-    { GIMP_LAYER_MODE_HSV_COLOR, "GIMP_LAYER_MODE_HSV_COLOR", "hsv-color" },
+    { GIMP_LAYER_MODE_HSL_COLOR, "GIMP_LAYER_MODE_HSL_COLOR", "hsl-color" },
     { GIMP_LAYER_MODE_HSV_VALUE, "GIMP_LAYER_MODE_HSV_VALUE", "hsv-value" },
     { GIMP_LAYER_MODE_DIVIDE, "GIMP_LAYER_MODE_DIVIDE", "divide" },
     { GIMP_LAYER_MODE_DODGE, "GIMP_LAYER_MODE_DODGE", "dodge" },
@@ -188,7 +188,7 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LIGHTEN_ONLY, NC_("layer-mode", "Lighten only"), NULL },
     { GIMP_LAYER_MODE_HSV_HUE, NC_("layer-mode", "Hue (HSV)"), NULL },
     { GIMP_LAYER_MODE_HSV_SATURATION, NC_("layer-mode", "Saturation (HSV)"), NULL },
-    { GIMP_LAYER_MODE_HSV_COLOR, NC_("layer-mode", "Color (HSV)"), NULL },
+    { GIMP_LAYER_MODE_HSL_COLOR, NC_("layer-mode", "Color (HSL)"), NULL },
     { GIMP_LAYER_MODE_HSV_VALUE, NC_("layer-mode", "Value (HSV)"), NULL },
     { GIMP_LAYER_MODE_DIVIDE, NC_("layer-mode", "Divide"), NULL },
     { GIMP_LAYER_MODE_DODGE, NC_("layer-mode", "Dodge"), NULL },
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index 760ea96..3598864 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -98,7 +98,7 @@ typedef enum
   GIMP_LAYER_MODE_LIGHTEN_ONLY,          /*< desc="Lighten only"             >*/
   GIMP_LAYER_MODE_HSV_HUE,               /*< desc="Hue (HSV)"                >*/
   GIMP_LAYER_MODE_HSV_SATURATION,        /*< desc="Saturation (HSV)"         >*/
-  GIMP_LAYER_MODE_HSV_COLOR,             /*< desc="Color (HSV)"              >*/
+  GIMP_LAYER_MODE_HSL_COLOR,             /*< desc="Color (HSL)"              >*/
   GIMP_LAYER_MODE_HSV_VALUE,             /*< desc="Value (HSV)"              >*/
   GIMP_LAYER_MODE_DIVIDE,                /*< desc="Divide"                   >*/
   GIMP_LAYER_MODE_DODGE,                 /*< desc="Dodge"                    >*/
diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h
index 868d775..6bfe09b 100644
--- a/libgimp/gimpenums.h
+++ b/libgimp/gimpenums.h
@@ -134,7 +134,7 @@ typedef enum
   GIMP_LAYER_MODE_LIGHTEN_ONLY,
   GIMP_LAYER_MODE_HSV_HUE,
   GIMP_LAYER_MODE_HSV_SATURATION,
-  GIMP_LAYER_MODE_HSV_COLOR,
+  GIMP_LAYER_MODE_HSL_COLOR,
   GIMP_LAYER_MODE_HSV_VALUE,
   GIMP_LAYER_MODE_DIVIDE,
   GIMP_LAYER_MODE_DODGE,
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 5311398..4d336d4 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -732,7 +732,7 @@ package Gimp::CodeGen::enums;
                          GIMP_LAYER_MODE_LIGHTEN_ONLY
                          GIMP_LAYER_MODE_HSV_HUE
                          GIMP_LAYER_MODE_HSV_SATURATION
-                         GIMP_LAYER_MODE_HSV_COLOR
+                         GIMP_LAYER_MODE_HSL_COLOR
                          GIMP_LAYER_MODE_HSV_VALUE GIMP_LAYER_MODE_DIVIDE
                          GIMP_LAYER_MODE_DODGE GIMP_LAYER_MODE_BURN
                          GIMP_LAYER_MODE_HARDLIGHT
@@ -788,7 +788,7 @@ package Gimp::CodeGen::enums;
                       GIMP_LAYER_MODE_LIGHTEN_ONLY => '36',
                       GIMP_LAYER_MODE_HSV_HUE => '37',
                       GIMP_LAYER_MODE_HSV_SATURATION => '38',
-                      GIMP_LAYER_MODE_HSV_COLOR => '39',
+                      GIMP_LAYER_MODE_HSL_COLOR => '39',
                       GIMP_LAYER_MODE_HSV_VALUE => '40',
                       GIMP_LAYER_MODE_DIVIDE => '41',
                       GIMP_LAYER_MODE_DODGE => '42',