From 76546f7e7cdd4f82805c923da3eea87e9753735a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
Date: Wed, 28 Mar 2012 00:54:12 +0100
Subject: [PATCH] rename lanczos to lohalo

GEGL had a broken lanczos implementation, the lohalo implementation is better
anyways (at least when passed a proper scale matrix).
---
 app/core/gimp-transform-region.c | 2 +-
 app/core/gimpdrawable.c          | 2 +-
 app/gegl/gimp-gegl-utils.c       | 2 +-
 app/paint-funcs/scale-region.c   | 4 ++--
 libgimpbase/gimpbaseenums.c      | 4 ++--
 libgimpbase/gimpbaseenums.h      | 9 +++++----
 tools/pdbgen/enums.pl            | 5 ++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/core/gimp-transform-region.c b/app/core/gimp-transform-region.c
index 2a28b672ad..3a1fbc5be3 100644
--- a/app/core/gimp-transform-region.c
+++ b/app/core/gimp-transform-region.c
@@ -266,7 +266,7 @@ gimp_transform_region (GimpPickable          *pickable,
                                    bg_color, progress);
       break;
 
-    case GIMP_INTERPOLATION_LANCZOS:
+    case GIMP_INTERPOLATION_LOHALO:
       gimp_transform_region_lanczos (orig_tiles, destPR,
                                      dest_x1, dest_y1, dest_x2, dest_y2,
                                      u1, v1, u2, v2,
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 6f8b0da982..678cbae452 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -446,7 +446,7 @@ gimp_drawable_scale (GimpItem              *item,
 #endif
 
   if (gimp_use_gegl (gimp_item_get_image (item)->gimp) &&
-      interpolation_type != GIMP_INTERPOLATION_LANCZOS)
+      interpolation_type != GIMP_INTERPOLATION_LOHALO)
     {
       GeglNode *scale;
 
diff --git a/app/gegl/gimp-gegl-utils.c b/app/gegl/gimp-gegl-utils.c
index 09374b5f4e..f494c23934 100644
--- a/app/gegl/gimp-gegl-utils.c
+++ b/app/gegl/gimp-gegl-utils.c
@@ -97,7 +97,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_LANCZOS: return "lohalo";
+    case GIMP_INTERPOLATION_LOHALO:  return "lohalo";
     default:
       break;
     }
diff --git a/app/paint-funcs/scale-region.c b/app/paint-funcs/scale-region.c
index aa399090c3..0c72c01d96 100644
--- a/app/paint-funcs/scale-region.c
+++ b/app/paint-funcs/scale-region.c
@@ -488,7 +488,7 @@ scale (TileManager           *srcTM,
       surround = pixel_surround_new (srcTM, 4, 4, PIXEL_SURROUND_SMEAR);
       break;
 
-    case GIMP_INTERPOLATION_LANCZOS:
+    case GIMP_INTERPOLATION_LOHALO:
       surround = pixel_surround_new (srcTM, 6, 6, PIXEL_SURROUND_SMEAR);
       kernel_lookup = create_lanczos3_lookup ();
       break;
@@ -537,7 +537,7 @@ scale (TileManager           *srcTM,
                                      sx, sy, xfrac, yfrac, bytes, pixel);
                   break;
 
-                case GIMP_INTERPOLATION_LANCZOS:
+                case GIMP_INTERPOLATION_LOHALO:
                   interpolate_lanczos3 (surround,
                                         sx, sy, xfrac, yfrac, bytes, pixel,
                                         kernel_lookup);
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 6a0b0c5f7e..aad38640c6 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -570,7 +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_LANCZOS, "GIMP_INTERPOLATION_LANCZOS", "lanczos" },
+    { GIMP_INTERPOLATION_LOHALO, "GIMP_INTERPOLATION_LOHALO", "lohalo" },
     { 0, NULL, NULL }
   };
 
@@ -579,7 +579,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_LANCZOS, NC_("interpolation-type", "Sinc (Lanczos3)"), NULL },
+    { GIMP_INTERPOLATION_LOHALO, NC_("interpolation-type", "LoHalo"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 10bb510df3..32b17e07ab 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -253,10 +253,11 @@ GType gimp_interpolation_type_get_type (void) G_GNUC_CONST;
 
 typedef enum
 {
-  GIMP_INTERPOLATION_NONE,   /*< desc="None"            >*/
-  GIMP_INTERPOLATION_LINEAR, /*< desc="Linear"          >*/
-  GIMP_INTERPOLATION_CUBIC,  /*< desc="Cubic"           >*/
-  GIMP_INTERPOLATION_LANCZOS /*< desc="Sinc (Lanczos3)" >*/
+  GIMP_INTERPOLATION_NONE,   /*< desc="None"   >*/
+  GIMP_INTERPOLATION_LINEAR, /*< desc="Linear" >*/
+  GIMP_INTERPOLATION_CUBIC,  /*< desc="Cubic"  >*/
+  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 d100aaac1d..68c1fad223 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -176,12 +176,11 @@ package Gimp::CodeGen::enums;
 	{ contig => 1,
 	  header => 'libgimpbase/gimpbaseenums.h',
 	  symbols => [ qw(GIMP_INTERPOLATION_NONE GIMP_INTERPOLATION_LINEAR
-			  GIMP_INTERPOLATION_CUBIC
-			  GIMP_INTERPOLATION_LANCZOS) ],
+			  GIMP_INTERPOLATION_CUBIC GIMP_INTERPOLATION_LOHALO) ],
 	  mapping => { GIMP_INTERPOLATION_NONE => '0',
 		       GIMP_INTERPOLATION_LINEAR => '1',
 		       GIMP_INTERPOLATION_CUBIC => '2',
-		       GIMP_INTERPOLATION_LANCZOS => '3' }
+		       GIMP_INTERPOLATION_LOHALO => '3' }
 	},
     GimpPaintApplicationMode =>
 	{ contig => 1,