[gimp/soc-2011-seamless-clone2] Add the Nohalo sampler (previously called Lohalo, which now does something different

[Clayton Walker <claytonw src gnome org>]

commit 8d4bdbe93817e92365e0d28fc1b8b32b830bf82e
Author: Nicolas Robidoux <nrobidoux git gnome org>
Date:   Mon Dec 31 15:27:07 2012 -0500

    Add the Nohalo sampler (previously called Lohalo, which now does something different

 app/gegl/gimp-gegl-utils.c  |    1 +
 libgimpbase/gimpbaseenums.c |    2 ++
 libgimpbase/gimpbaseenums.h |    1 +
 tools/pdbgen/enums.pl       |    6 ++++--
 4 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-utils.c b/app/gegl/gimp-gegl-utils.c
index 3fdfecf..f005355 100644
--- a/app/gegl/gimp-gegl-utils.c
+++ b/app/gegl/gimp-gegl-utils.c
@@ -37,6 +37,7 @@ gimp_interpolation_to_gegl_filter (GimpInterpolationType interpolation)
     case GIMP_INTERPOLATION_NONE:    return "nearest";
     case GIMP_INTERPOLATION_LINEAR:  return "linear";
     case GIMP_INTERPOLATION_CUBIC:   return "cubic";
+    case GIMP_INTERPOLATION_NOHALO:  return "nohalo";
     case GIMP_INTERPOLATION_LOHALO:  return "lohalo";
     default:
       break;
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index aad3864..df3ac2e 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -570,6 +570,7 @@ gimp_interpolation_type_get_type (void)
     { GIMP_INTERPOLATION_NONE, "GIMP_INTERPOLATION_NONE", "none" },
     { GIMP_INTERPOLATION_LINEAR, "GIMP_INTERPOLATION_LINEAR", "linear" },
     { GIMP_INTERPOLATION_CUBIC, "GIMP_INTERPOLATION_CUBIC", "cubic" },
+    { GIMP_INTERPOLATION_NOHALO, "GIMP_INTERPOLATION_NOHALO", "nohalo" },
     { GIMP_INTERPOLATION_LOHALO, "GIMP_INTERPOLATION_LOHALO", "lohalo" },
     { 0, NULL, NULL }
   };
@@ -579,6 +580,7 @@ gimp_interpolation_type_get_type (void)
     { GIMP_INTERPOLATION_NONE, NC_("interpolation-type", "None"), NULL },
     { GIMP_INTERPOLATION_LINEAR, NC_("interpolation-type", "Linear"), NULL },
     { GIMP_INTERPOLATION_CUBIC, NC_("interpolation-type", "Cubic"), NULL },
+    { GIMP_INTERPOLATION_NOHALO, NC_("interpolation-type", "NoHalo"), NULL },
     { GIMP_INTERPOLATION_LOHALO, NC_("interpolation-type", "LoHalo"), NULL },
     { 0, NULL, NULL }
   };
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 32b17e0..8dd8a32 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -256,6 +256,7 @@ typedef enum
   GIMP_INTERPOLATION_NONE,   /*< desc="None"   >*/
   GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/
   GIMP_INTERPOLATION_CUBIC,  /*< desc="Cubic"  >*/
+  GIMP_INTERPOLATION_NOHALO, /*< desc="NoHalo" >*/
   GIMP_INTERPOLATION_LOHALO, /*< desc="LoHalo" >*/
   GIMP_INTERPOLATION_LANCZOS = GIMP_INTERPOLATION_LOHALO /*< skip */
 } GimpInterpolationType;
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 154eef2..697d463 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -176,11 +176,13 @@ package Gimp::CodeGen::enums;
        { contig => 1,
          header => 'libgimpbase/gimpbaseenums.h',
          symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR
-                         GIMP_INTERPOLATION_CUBIC GIMP_INTERPOLATION_LOHALO) ],
+                         GIMP_INTERPOLATION_CUBIC GIMP_INTERPOLATION_NOHALO
+                         GIMP_INTERPOLATION_LOHALO) ],
          mapping => { GIMP_INTERPOLATION_NONE => '0',
                       GIMP_INTERPOLATION_LINEAR => '1',
                       GIMP_INTERPOLATION_CUBIC => '2',
-                      GIMP_INTERPOLATION_LOHALO => '3' }
+                      GIMP_INTERPOLATION_NOHALO => '3',
+                      GIMP_INTERPOLATION_LOHALO => '4' }
        },
     GimpPaintApplicationMode =>
        { contig => 1,