[gimp] app, libgimp: commit regenerated files after enum GimpLayerMode change

[Michael Natterer <mitch src gnome org>]

commit 314ad956f8fb9fb873ee61bfec6d55a76151a848
Author: Michael Natterer <mitch gimp org>
Date:   Mon Feb 20 18:21:12 2017 +0100

    app, libgimp: commit regenerated files after enum GimpLayerMode change
    
    and reorder the GimpLayerModeInfo array correctly.

 app/core/gimpimage.c                          |    1 -
 app/operations/layer-modes/gimp-layer-modes.c |   24 +++++-----
 app/operations/operations-enums.c             |    4 +-
 libgimp/gimpenums.h                           |    4 +-
 tools/pdbgen/enums.pl                         |   62 ++++++++++++------------
 5 files changed, 47 insertions(+), 48 deletions(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 0d20cb8..5a81a91 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -2407,7 +2407,6 @@ gimp_image_get_xcf_version (GimpImage    *image,
         case GIMP_LAYER_MODE_LCH_CHROMA:
         case GIMP_LAYER_MODE_LCH_COLOR:
         case GIMP_LAYER_MODE_LCH_LIGHTNESS:
-        case GIMP_LAYER_MODE_LUMINANCE:
           version = MAX (9, version);
           break;
 
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 7cdae33..e69f141 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -471,18 +471,6 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .blend_space          = GIMP_LAYER_COLOR_SPACE_LAB
   },
 
-  { GIMP_LAYER_MODE_LUMINANCE,
-
-    .op_name              = "gimp:layer-mode",
-    .function             = gimp_operation_layer_mode_process_pixels,
-    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
-    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
-    .paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
-    .composite_mode       = GIMP_LAYER_COMPOSITE_SRC_ATOP,
-    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
-    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
-  },
-
   { GIMP_LAYER_MODE_NORMAL_LINEAR,
 
     .op_name              = "gimp:normal",
@@ -796,6 +784,18 @@ static const GimpLayerModeInfo layer_mode_infos[] =
     .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
   },
 
+  { GIMP_LAYER_MODE_LUMINANCE,
+
+    .op_name              = "gimp:layer-mode",
+    .function             = gimp_operation_layer_mode_process_pixels,
+    .flags                = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
+    .context              = GIMP_LAYER_MODE_CONTEXT_ALL,
+    .paint_composite_mode = GIMP_LAYER_COMPOSITE_SRC_OVER,
+    .composite_mode       = GIMP_LAYER_COMPOSITE_SRC_ATOP,
+    .composite_space      = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+    .blend_space          = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
+  },
+
   { GIMP_LAYER_MODE_ERASE,
 
     .op_name              = "gimp:erase",
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index c7c5656..2c876d1 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -109,7 +109,6 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" },
     { GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" },
     { GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" },
-    { GIMP_LAYER_MODE_LUMINANCE, "GIMP_LAYER_MODE_LUMINANCE", "luminance" },
     { GIMP_LAYER_MODE_NORMAL_LINEAR, "GIMP_LAYER_MODE_NORMAL_LINEAR", "normal-linear" },
     { GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
     { GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" },
@@ -138,6 +137,7 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LINEAR_BURN, "GIMP_LAYER_MODE_LINEAR_BURN", "linear-burn" },
     { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, "GIMP_LAYER_MODE_LUMA_DARKEN_ONLY", "luma-darken-only" },
     { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, "GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY", "luma-lighten-only" },
+    { GIMP_LAYER_MODE_LUMINANCE, "GIMP_LAYER_MODE_LUMINANCE", "luminance" },
     { GIMP_LAYER_MODE_ERASE, "GIMP_LAYER_MODE_ERASE", "erase" },
     { GIMP_LAYER_MODE_REPLACE, "GIMP_LAYER_MODE_REPLACE", "replace" },
     { GIMP_LAYER_MODE_ANTI_ERASE, "GIMP_LAYER_MODE_ANTI_ERASE", "anti-erase" },
@@ -174,7 +174,6 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL },
     { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL },
     { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL },
-    { GIMP_LAYER_MODE_LUMINANCE, NC_("layer-mode", "Luminance"), NULL },
     { GIMP_LAYER_MODE_NORMAL_LINEAR, NC_("layer-mode", "Normal (linear)"), NULL },
     { GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
     { GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL },
@@ -203,6 +202,7 @@ gimp_layer_mode_get_type (void)
     { GIMP_LAYER_MODE_LINEAR_BURN, NC_("layer-mode", "Linear burn"), NULL },
     { GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, NC_("layer-mode", "Luma/Luminance darken only"), NULL },
     { GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, NC_("layer-mode", "Luma/Luminance lighten only"), NULL },
+    { GIMP_LAYER_MODE_LUMINANCE, NC_("layer-mode", "Luminance"), NULL },
     { GIMP_LAYER_MODE_ERASE, NC_("layer-mode", "Erase"), NULL },
     { GIMP_LAYER_MODE_REPLACE, NC_("layer-mode", "Replace"), NULL },
     { GIMP_LAYER_MODE_ANTI_ERASE, NC_("layer-mode", "Anti erase"), NULL },
diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h
index 1519a4d..5beaba9 100644
--- a/libgimp/gimpenums.h
+++ b/libgimp/gimpenums.h
@@ -123,7 +123,6 @@ typedef enum
   GIMP_LAYER_MODE_LCH_CHROMA,
   GIMP_LAYER_MODE_LCH_COLOR,
   GIMP_LAYER_MODE_LCH_LIGHTNESS,
-  GIMP_LAYER_MODE_LUMINANCE,
   GIMP_LAYER_MODE_NORMAL_LINEAR,
   GIMP_LAYER_MODE_BEHIND,
   GIMP_LAYER_MODE_MULTIPLY,
@@ -151,7 +150,8 @@ typedef enum
   GIMP_LAYER_MODE_EXCLUSION,
   GIMP_LAYER_MODE_LINEAR_BURN,
   GIMP_LAYER_MODE_LUMA_DARKEN_ONLY,
-  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY
+  GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY,
+  GIMP_LAYER_MODE_LUMINANCE
 } GimpLayerMode;
 
 
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 90d2269..351c86c 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -722,7 +722,6 @@ package Gimp::CodeGen::enums;
                          GIMP_LAYER_MODE_LCH_CHROMA
                          GIMP_LAYER_MODE_LCH_COLOR
                          GIMP_LAYER_MODE_LCH_LIGHTNESS
-                         GIMP_LAYER_MODE_LUMINANCE
                          GIMP_LAYER_MODE_NORMAL_LINEAR
                          GIMP_LAYER_MODE_BEHIND GIMP_LAYER_MODE_MULTIPLY
                          GIMP_LAYER_MODE_SCREEN GIMP_LAYER_MODE_DIFFERENCE
@@ -744,7 +743,8 @@ package Gimp::CodeGen::enums;
                          GIMP_LAYER_MODE_HARD_MIX GIMP_LAYER_MODE_EXCLUSION
                          GIMP_LAYER_MODE_LINEAR_BURN
                          GIMP_LAYER_MODE_LUMA_DARKEN_ONLY
-                         GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY) ],
+                         GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY
+                         GIMP_LAYER_MODE_LUMINANCE) ],
          mapping => { GIMP_LAYER_MODE_NORMAL => '0',
                       GIMP_LAYER_MODE_DISSOLVE => '1',
                       GIMP_LAYER_MODE_BEHIND_LEGACY => '2',
@@ -773,35 +773,35 @@ package Gimp::CodeGen::enums;
                       GIMP_LAYER_MODE_LCH_CHROMA => '25',
                       GIMP_LAYER_MODE_LCH_COLOR => '26',
                       GIMP_LAYER_MODE_LCH_LIGHTNESS => '27',
-                      GIMP_LAYER_MODE_LUMINANCE => '28',
-                      GIMP_LAYER_MODE_NORMAL_LINEAR => '29',
-                      GIMP_LAYER_MODE_BEHIND => '30',
-                      GIMP_LAYER_MODE_MULTIPLY => '31',
-                      GIMP_LAYER_MODE_SCREEN => '32',
-                      GIMP_LAYER_MODE_DIFFERENCE => '33',
-                      GIMP_LAYER_MODE_ADDITION => '34',
-                      GIMP_LAYER_MODE_SUBTRACT => '35',
-                      GIMP_LAYER_MODE_DARKEN_ONLY => '36',
-                      GIMP_LAYER_MODE_LIGHTEN_ONLY => '37',
-                      GIMP_LAYER_MODE_HSV_HUE => '38',
-                      GIMP_LAYER_MODE_HSV_SATURATION => '39',
-                      GIMP_LAYER_MODE_HSV_COLOR => '40',
-                      GIMP_LAYER_MODE_HSV_VALUE => '41',
-                      GIMP_LAYER_MODE_DIVIDE => '42',
-                      GIMP_LAYER_MODE_DODGE => '43',
-                      GIMP_LAYER_MODE_BURN => '44',
-                      GIMP_LAYER_MODE_HARDLIGHT => '45',
-                      GIMP_LAYER_MODE_SOFTLIGHT => '46',
-                      GIMP_LAYER_MODE_GRAIN_EXTRACT => '47',
-                      GIMP_LAYER_MODE_GRAIN_MERGE => '48',
-                      GIMP_LAYER_MODE_VIVID_LIGHT => '49',
-                      GIMP_LAYER_MODE_PIN_LIGHT => '50',
-                      GIMP_LAYER_MODE_LINEAR_LIGHT => '51',
-                      GIMP_LAYER_MODE_HARD_MIX => '52',
-                      GIMP_LAYER_MODE_EXCLUSION => '53',
-                      GIMP_LAYER_MODE_LINEAR_BURN => '54',
-                      GIMP_LAYER_MODE_LUMA_DARKEN_ONLY => '55',
-                      GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY => '56' }
+                      GIMP_LAYER_MODE_NORMAL_LINEAR => '28',
+                      GIMP_LAYER_MODE_BEHIND => '29',
+                      GIMP_LAYER_MODE_MULTIPLY => '30',
+                      GIMP_LAYER_MODE_SCREEN => '31',
+                      GIMP_LAYER_MODE_DIFFERENCE => '32',
+                      GIMP_LAYER_MODE_ADDITION => '33',
+                      GIMP_LAYER_MODE_SUBTRACT => '34',
+                      GIMP_LAYER_MODE_DARKEN_ONLY => '35',
+                      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_HSV_VALUE => '40',
+                      GIMP_LAYER_MODE_DIVIDE => '41',
+                      GIMP_LAYER_MODE_DODGE => '42',
+                      GIMP_LAYER_MODE_BURN => '43',
+                      GIMP_LAYER_MODE_HARDLIGHT => '44',
+                      GIMP_LAYER_MODE_SOFTLIGHT => '45',
+                      GIMP_LAYER_MODE_GRAIN_EXTRACT => '46',
+                      GIMP_LAYER_MODE_GRAIN_MERGE => '47',
+                      GIMP_LAYER_MODE_VIVID_LIGHT => '48',
+                      GIMP_LAYER_MODE_PIN_LIGHT => '49',
+                      GIMP_LAYER_MODE_LINEAR_LIGHT => '50',
+                      GIMP_LAYER_MODE_HARD_MIX => '51',
+                      GIMP_LAYER_MODE_EXCLUSION => '52',
+                      GIMP_LAYER_MODE_LINEAR_BURN => '53',
+                      GIMP_LAYER_MODE_LUMA_DARKEN_ONLY => '54',
+                      GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY => '55',
+                      GIMP_LAYER_MODE_LUMINANCE => '56' }
        },
     GimpConvertDitherType =>
        { contig => 1,