[gegl/soc-2011-warp: 20/20] fix slightly wrong merge

[Michael Murà <mmure src gnome org>]

commit bf62f911a33f2832f6c8a5f47745df122e53fc7e
Author: Michael Murà <batolettre gmail com>
Date:   Sun Sep 4 20:36:16 2011 +0200

    fix slightly wrong merge

 gegl/gegl-enums.c |   20 ++++++++++++++++++++
 gegl/gegl-enums.h |   12 ++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/gegl/gegl-enums.c b/gegl/gegl-enums.c
index 57cefdc..4d9ad59 100644
--- a/gegl/gegl-enums.c
+++ b/gegl/gegl-enums.c
@@ -41,6 +41,26 @@ gegl_ripple_wave_type_get_type (void)
   return etype;
 }
 
+GType
+gegl_warp_behavior_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { GEGL_WARP_BEHAVIOR_MOVE, "move", "move" },
+      { GEGL_WARP_BEHAVIOR_GROW, "grow", "grow" },
+      { GEGL_WARP_BEHAVIOR_SHRINK, "shrink", "shrink" },
+      { GEGL_WARP_BEHAVIOR_SWIRL_CW, "swirl-cw", "swirl-cw" },
+      { GEGL_WARP_BEHAVIOR_SWIRL_CCW, "swirl-ccw", "swirl-ccw" },
+      { GEGL_WARP_BEHAVIOR_ERASE, "erase", "erase" },
+      { GEGL_WARP_BEHAVIOR_SMOOTH, "smooth", "smooth" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("GeglWarpBehavior", values);
+  }
+  return etype;
+}
+
 
 /* Generated data ends here */
 
diff --git a/gegl/gegl-enums.h b/gegl/gegl-enums.h
index b896575..b377ad5 100644
--- a/gegl/gegl-enums.h
+++ b/gegl/gegl-enums.h
@@ -52,6 +52,18 @@ typedef enum {
 GType gegl_ripple_wave_type_get_type   (void) G_GNUC_CONST;
 #define GEGL_RIPPLE_WAVE_TYPE (gegl_ripple_wave_type_get_type())
 
+typedef enum
+{
+  GEGL_WARP_BEHAVIOR_MOVE,      /*< desc="Move pixels"              >*/
+  GEGL_WARP_BEHAVIOR_GROW,      /*< desc="Grow area"                >*/
+  GEGL_WARP_BEHAVIOR_SHRINK,    /*< desc="Shrink area"              >*/
+  GEGL_WARP_BEHAVIOR_SWIRL_CW,  /*< desc="Swirl clockwise"          >*/
+  GEGL_WARP_BEHAVIOR_SWIRL_CCW, /*< desc="Swirl counter-clockwise"  >*/
+  GEGL_WARP_BEHAVIOR_ERASE,     /*< desc="Erase warping"            >*/
+  GEGL_WARP_BEHAVIOR_SMOOTH     /*< desc="Smooth warping"           >*/
+} GeglWarpBehavior;
+GType gegl_warp_behavior_get_type (void) G_GNUC_CONST;
+#define GEGL_TYPE_WARP_BEHAVIOR (gegl_warp_behavior_get_type ())
 
 G_END_DECLS