[gegl] buffer: remove lanczos sampler



commit 5599de56527aab559a35b6e1e65e9f0896091189
Author: Ãyvind KolÃs <pippin gimp org>
Date:   Wed Mar 28 00:31:58 2012 +0100

    buffer: remove lanczos sampler

 gegl/buffer/Makefile.am            |    2 -
 gegl/buffer/gegl-buffer-access.c   |    1 -
 gegl/buffer/gegl-buffer.c          |    1 -
 gegl/buffer/gegl-buffer.h          |    6 +-
 gegl/buffer/gegl-sampler-lanczos.c |  294 ------------------------------------
 gegl/buffer/gegl-sampler-lanczos.h |   54 -------
 gegl/buffer/gegl-sampler.c         |   18 +--
 gegl/gegl-enums.h                  |    1 -
 8 files changed, 6 insertions(+), 371 deletions(-)
---
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index a1b3c18..505906f 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -28,7 +28,6 @@ libbuffer_la_SOURCES = \
     gegl-cache.c		\
     gegl-sampler.c		\
     gegl-sampler-cubic.c	\
-    gegl-sampler-lanczos.c	\
     gegl-sampler-linear.c	\
     gegl-sampler-nearest.c	\
     gegl-sampler-lohalo.c       \
@@ -58,7 +57,6 @@ libbuffer_la_SOURCES = \
     gegl-cache.h		\
     gegl-sampler.h		\
     gegl-sampler-cubic.h	\
-    gegl-sampler-lanczos.h	\
     gegl-sampler-linear.h	\
     gegl-sampler-nearest.h	\
     gegl-sampler-lohalo.h       \
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index 8812519..d7f4b14 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -34,7 +34,6 @@
 #include "gegl-sampler-nearest.h"
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
-#include "gegl-sampler-lanczos.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 fa11b1a..0959992 100644
--- a/gegl/buffer/gegl-buffer.c
+++ b/gegl/buffer/gegl-buffer.c
@@ -62,7 +62,6 @@
 #include "gegl-sampler-nearest.h"
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
-#include "gegl-sampler-lanczos.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 dcb6fab..7f50429 100644
--- a/gegl/buffer/gegl-buffer.h
+++ b/gegl/buffer/gegl-buffer.h
@@ -380,8 +380,7 @@ GeglBuffer *    gegl_buffer_dup               (GeglBuffer       *buffer);
  * @format: the format to store the sampled color in.
  * @sampler_type: the sampler type to use,
  * to be ported from working code. Valid values: GEGL_SAMPLER_NEAREST,
- * GEGL_SAMPLER_LINEAR, GEGL_SAMPLER_CUBIC,
- * GEGL_SAMPLER_LANCZOS and GEGL_SAMPLER_LOHALO
+ * GEGL_SAMPLER_LINEAR, GEGL_SAMPLER_CUBIC and GEGL_SAMPLER_LOHALO
  * @repeat_mode: how request outside the buffer extent are handled.
  * valid values: GEGL_ABYSS_NONE
  *
@@ -429,8 +428,7 @@ GeglSamplerType gegl_sampler_type_from_string (const gchar *string);
  * @format: format we want data back in
  * @sampler_type: the sampler type to use,
  * to be ported from working code. Valid values: GEGL_SAMPLER_NEAREST,
- * GEGL_SAMPLER_LINEAR, GEGL_SAMPLER_CUBIC,
- * GEGL_SAMPLER_LANCZOS and GEGL_SAMPLER_LOHALO
+ * GEGL_SAMPLER_LINEAR, GEGL_SAMPLER_CUBIC and GEGL_SAMPLER_LOHALO
  *
  * Create a new sampler, when you are done with the sampler, g_object_unref
  * it.
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index c440c17..2146f01 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -33,7 +33,6 @@
 #include "gegl-sampler-nearest.h"
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
-#include "gegl-sampler-lanczos.h"
 #include "gegl-sampler-lohalo.h"
 
 enum
@@ -561,8 +560,6 @@ gegl_sampler_gtype_from_enum (GeglSamplerType sampler_type)
         return GEGL_TYPE_SAMPLER_LINEAR;
       case GEGL_SAMPLER_CUBIC:
         return GEGL_TYPE_SAMPLER_CUBIC;
-      case GEGL_SAMPLER_LANCZOS:
-        return GEGL_TYPE_SAMPLER_LANCZOS;
       case GEGL_SAMPLER_LOHALO:
         return GEGL_TYPE_SAMPLER_LOHALO;
       default:
@@ -580,17 +577,10 @@ gegl_buffer_sampler_new (GeglBuffer       *buffer,
   if (format == NULL)
     format = babl_format ("RaGaBaA float");
   desired_type = gegl_sampler_gtype_from_enum (sampler_type);
-  if (sampler_type == GEGL_SAMPLER_LANCZOS)
-      sampler = g_object_new (desired_type,
-                              "format", format,
-                              "buffer", buffer,
-                              "lanczos_width",  4,
-                              NULL);
-  else
-      sampler = g_object_new (desired_type,
-                              "buffer", buffer,
-                              "format", format,
-                              NULL);
+  sampler = g_object_new (desired_type,
+                          "buffer", buffer,
+                          "format", format,
+                          NULL);
   gegl_sampler_prepare (sampler);
   return sampler;
 }
diff --git a/gegl/gegl-enums.h b/gegl/gegl-enums.h
index 5d8edba..aeb6346 100644
--- a/gegl/gegl-enums.h
+++ b/gegl/gegl-enums.h
@@ -35,7 +35,6 @@ typedef enum {
   GEGL_SAMPLER_NEAREST = 0,   /*< desc="nearest"      >*/
   GEGL_SAMPLER_LINEAR,        /*< desc="linear"       >*/
   GEGL_SAMPLER_CUBIC,         /*< desc="cubic"        >*/
-  GEGL_SAMPLER_LANCZOS,       /*< desc="lanczos"      >*/
   GEGL_SAMPLER_LOHALO         /*< desc="lohalo"       >*/
 } GeglSamplerType;
 GType gegl_sampler_type_get_type   (void) G_GNUC_CONST;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]