[gegl/samplers] Remove references to deprecated samplers

[Adam Turcotte <aturcotte src gnome org>]

commit e598a2e7c5b449dfe2cd2b1fd5063aa431a77c22
Author: Adam Turcotte <aturcotte src gnome org>
Date:   Fri Jun 17 13:34:29 2011 -0400

    Remove references to deprecated samplers

 gegl/buffer/Makefile.am             |    6 ------
 gegl/buffer/gegl-buffer-access.c    |    3 ---
 gegl/buffer/gegl-buffer.c           |    3 ---
 gegl/buffer/gegl-buffer.h           |    3 ---
 gegl/buffer/gegl-sampler.c          |   18 ------------------
 operations/affine/affine.c          |    2 +-
 tests/compositions/Makefile.am      |    8 +-------
 tests/compositions/upsharptest.xml  |   35 -----------------------------------
 tests/compositions/upsizetest.xml   |   35 -----------------------------------
 tests/compositions/upsmoothtest.xml |   35 -----------------------------------
 10 files changed, 2 insertions(+), 146 deletions(-)
---
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index e04b303..72f3e43 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -27,9 +27,6 @@ libbuffer_la_SOURCES = \
     gegl-sampler-lanczos.c	\
     gegl-sampler-linear.c	\
     gegl-sampler-nearest.c	\
-    gegl-sampler-upsharp.c	\
-    gegl-sampler-upsize.c 	\
-    gegl-sampler-upsmooth.c	\
     gegl-sampler-lohalo.c       \
     gegl-region-generic.c	\
     gegl-tile.c			\
@@ -58,9 +55,6 @@ libbuffer_la_SOURCES = \
     gegl-sampler-lanczos.h	\
     gegl-sampler-linear.h	\
     gegl-sampler-nearest.h	\
-    gegl-sampler-upsharp.h	\
-    gegl-sampler-upsize.h 	\
-    gegl-sampler-upsmooth.h	\
     gegl-sampler-lohalo.h       \
     gegl-region.h		\
     gegl-region-generic.h	\
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index f2b04fc..81c9483 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -35,9 +35,6 @@
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
 #include "gegl-sampler-lanczos.h"
-#include "gegl-sampler-upsharp.h"
-#include "gegl-sampler-upsize.h"
-#include "gegl-sampler-upsmooth.h"
 #include "gegl-sampler-lohalo.h"
 #include "gegl-buffer-index.h"
 #include "gegl-tile-backend.h"
diff --git a/gegl/buffer/gegl-buffer.c b/gegl/buffer/gegl-buffer.c
index d274bf6..08056bb 100644
--- a/gegl/buffer/gegl-buffer.c
+++ b/gegl/buffer/gegl-buffer.c
@@ -62,9 +62,6 @@
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
 #include "gegl-sampler-lanczos.h"
-#include "gegl-sampler-upsharp.h"
-#include "gegl-sampler-upsize.h"
-#include "gegl-sampler-upsmooth.h"
 #include "gegl-sampler-lohalo.h"
 #include "gegl-types-internal.h"
 #include "gegl-utils.h"
diff --git a/gegl/buffer/gegl-buffer.h b/gegl/buffer/gegl-buffer.h
index 1494ec5..f303f52 100644
--- a/gegl/buffer/gegl-buffer.h
+++ b/gegl/buffer/gegl-buffer.h
@@ -312,9 +312,6 @@ typedef enum {
   GEGL_INTERPOLATION_LINEAR,
   GEGL_INTERPOLATION_CUBIC,
   GEGL_INTERPOLATION_LANCZOS,
-  GEGL_INTERPOLATION_UPSHARP,
-  GEGL_INTERPOLATION_UPSIZE,
-  GEGL_INTERPOLATION_UPSMOOTH,
   GEGL_INTERPOLATION_LOHALO
 } GeglInterpolation;
 
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index 72ac5bf..3875fcb 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -31,9 +31,6 @@
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
 #include "gegl-sampler-lanczos.h"
-#include "gegl-sampler-upsharp.h"
-#include "gegl-sampler-upsize.h"
-#include "gegl-sampler-upsmooth.h"
 #include "gegl-sampler-lohalo.h"
 
 enum
@@ -463,15 +460,6 @@ gegl_buffer_interpolation_from_string (const gchar *string)
       g_str_equal (string, "bicubic"))
     return GEGL_INTERPOLATION_CUBIC;
 
-  if (g_str_equal (string, "upsharp"))
-    return GEGL_INTERPOLATION_UPSHARP;
-
-  if (g_str_equal (string, "upsize"))
-    return GEGL_INTERPOLATION_UPSIZE;
-
-  if (g_str_equal (string, "upsmooth"))
-    return GEGL_INTERPOLATION_UPSMOOTH;
-
   if (g_str_equal (string, "lohalo"))
     return GEGL_INTERPOLATION_LOHALO;
 
@@ -491,12 +479,6 @@ gegl_sampler_type_from_interpolation (GeglInterpolation interpolation)
         return GEGL_TYPE_SAMPLER_CUBIC;
       case GEGL_INTERPOLATION_LANCZOS:
         return GEGL_TYPE_SAMPLER_LANCZOS;
-      case GEGL_INTERPOLATION_UPSHARP:
-        return GEGL_TYPE_SAMPLER_UPSHARP;
-      case GEGL_INTERPOLATION_UPSIZE:
-        return GEGL_TYPE_SAMPLER_UPSIZE;
-      case GEGL_INTERPOLATION_UPSMOOTH:
-        return GEGL_TYPE_SAMPLER_UPSMOOTH;
       case GEGL_INTERPOLATION_LOHALO:
         return GEGL_TYPE_SAMPLER_LOHALO;
       default:
diff --git a/operations/affine/affine.c b/operations/affine/affine.c
index b44c2f2..967fadd 100644
--- a/operations/affine/affine.c
+++ b/operations/affine/affine.c
@@ -252,7 +252,7 @@ op_affine_class_init (OpAffineClass *klass)
                                    g_param_spec_string (
                                      "filter",
                                      _("Filter"),
-                                     _("Filter type (nearest, linear, lanczos, cubic, upsharp, upsize, upsmooth, lohalo)"),
+                                     _("Filter type (nearest, linear, lanczos, cubic, lohalo)"),
                                      "linear",
                                      G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, PROP_HARD_EDGES,
diff --git a/tests/compositions/Makefile.am b/tests/compositions/Makefile.am
index 948c540..6842f95 100644
--- a/tests/compositions/Makefile.am
+++ b/tests/compositions/Makefile.am
@@ -32,9 +32,6 @@ testsuffix = .sh
 TESTS = \
   run-clones.xml.sh                    \
   run-composite-transform.xml.sh       \
-  run-downsharptest-broken.xml.sh      \
-  run-downsizetest-broken.xml.sh       \
-  run-downsmoothtest-broken.xml.sh     \
   run-edge-laplace-broken.xml.sh       \
   run-edge-sobel.xml.sh                \
   run-fattal02.xml.sh                  \
@@ -50,10 +47,7 @@ TESTS = \
   run-rgbe-save.xml.sh                 \
   run-rotate.xml.sh                    \
   run-simple-scale.xml.sh              \
-  run-transform.xml.sh                 \
-  run-upsharptest.xml.sh               \
-  run-upsizetest.xml.sh                \
-  run-upsmoothtest.xml.sh
+  run-transform.xml.sh
 
 # Conditional tests
 if HAVE_JASPER