[gimp] app, libgimp: found two more hidden GIMP_LAYER_MODE_NORMAL_NON_LINEAR

[Michael Natterer <mitch src gnome org>]

commit 8d744bc6c669e38d10f0ecfe93f6a06172495e47
Author: Michael Natterer <mitch gimp org>
Date:   Sat Jan 28 22:48:36 2017 +0100

    app, libgimp: found two more hidden GIMP_LAYER_MODE_NORMAL_NON_LINEAR

 app/tests/test-xcf.c |    2 +-
 libgimp/gimptypes.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c
index c48213d..ba2e514 100644
--- a/app/tests/test-xcf.c
+++ b/app/tests/test-xcf.c
@@ -68,7 +68,7 @@
 #define GIMP_MAINIMAGE_LAYER1_HEIGHT    51
 #define GIMP_MAINIMAGE_LAYER1_FORMAT    babl_format ("R'G'B'A u8")
 #define GIMP_MAINIMAGE_LAYER1_OPACITY   GIMP_OPACITY_OPAQUE
-#define GIMP_MAINIMAGE_LAYER1_MODE      GIMP_LAYER_MODE_NORMAL_NON_LINEAR
+#define GIMP_MAINIMAGE_LAYER1_MODE      GIMP_LAYER_MODE_NORMAL
 
 #define GIMP_MAINIMAGE_LAYER2_NAME      "layer2"
 #define GIMP_MAINIMAGE_LAYER2_WIDTH     25
diff --git a/libgimp/gimptypes.h b/libgimp/gimptypes.h
index 365585f..ebef753 100644
--- a/libgimp/gimptypes.h
+++ b/libgimp/gimptypes.h
@@ -46,7 +46,7 @@ typedef struct _GimpParam       GimpParam;
  */
 typedef GimpLayerMode GimpLayerModeEffects;
 
-#define GIMP_NORMAL_MODE        GIMP_LAYER_MODE_NORMAL_NON_LINEAR
+#define GIMP_NORMAL_MODE        GIMP_LAYER_MODE_NORMAL
 #define GIMP_DISSOLVE_MODE      GIMP_LAYER_MODE_DISSOLVE
 #define GIMP_BEHIND_MODE        GIMP_LAYER_MODE_BEHIND
 #define GIMP_MULTIPLY_MODE      GIMP_LAYER_MODE_MULTIPLY_LEGACY