GNOME.org
 

[gegl/samplers] GeglMatrix2 is no longer needed and has been removed. Inverse jacobian is now a gdouble array instea

commit ec1eafab7d58d342800ad69847014fce47445833
Author: Adam Turcotte <aturcotte src gnome org>
Date:   Mon Jul 26 14:35:16 2010 -0400

    GeglMatrix2 is no longer needed and has been removed. Inverse jacobian is now a gdouble array instead of a GeglMatrix2. Downsamplers are broken and have been removed, along with the regression tests.

 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-downsharp.c               |   26 -
 gegl/buffer/gegl-sampler-downsharp.h               |   48 -
 gegl/buffer/gegl-sampler-downsharpfast.c           |   26 -
 gegl/buffer/gegl-sampler-downsharpfast.h           |   48 -
 gegl/buffer/gegl-sampler-downsize.c                |  943 --------------------
 gegl/buffer/gegl-sampler-downsize.h                |   48 -
 gegl/buffer/gegl-sampler-downsizefast.c            |  631 -------------
 gegl/buffer/gegl-sampler-downsizefast.h            |   48 -
 gegl/buffer/gegl-sampler-downsmooth.c              |   26 -
 gegl/buffer/gegl-sampler-downsmooth.h              |   48 -
 gegl/buffer/gegl-sampler-downsmoothfast.c          |   26 -
 gegl/buffer/gegl-sampler-downsmoothfast.h          |   48 -
 gegl/buffer/gegl-sampler.c                         |   18 -
 gegl/buffer/gegl-sampler.h                         |    2 +-
 gegl/gegl-matrix.h                                 |    1 -
 operations/affine/affine.c                         |   14 +-
 tests/compositions/downsharptest-broken.xml        |   35 -
 tests/compositions/downsizetest-broken.xml         |   35 -
 tests/compositions/downsmoothtest-broken.xml       |   35 -
 .../reference/downsharptest-broken.png             |  Bin 27749 -> 0 bytes
 .../compositions/reference/downsizetest-broken.png |  Bin 27653 -> 0 bytes
 .../reference/downsmoothtest-broken.png            |  Bin 27307 -> 0 bytes
 26 files changed, 8 insertions(+), 2113 deletions(-)
---
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index 9fe52ba..36726e2 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -33,9 +33,6 @@ libbuffer_la_SOURCES = \
     gegl-sampler-lanczos.c	\
     gegl-sampler-linear.c	\
     gegl-sampler-nearest.c	\
-    gegl-sampler-downsharp.c	\
-    gegl-sampler-downsize.c 	\
-    gegl-sampler-downsmooth.c	\
     gegl-sampler-upsharp.c	\
     gegl-sampler-upsize.c 	\
     gegl-sampler-upsmooth.c	\
@@ -66,9 +63,6 @@ libbuffer_la_SOURCES = \
     gegl-sampler-lanczos.h	\
     gegl-sampler-linear.h	\
     gegl-sampler-nearest.h	\
-    gegl-sampler-downsharp.h	\
-    gegl-sampler-downsize.h 	\
-    gegl-sampler-downsmooth.h	\
     gegl-sampler-upsharp.h	\
     gegl-sampler-upsize.h 	\
     gegl-sampler-upsmooth.h	\
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index de729d4..c52701e 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -37,9 +37,6 @@
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
 #include "gegl-sampler-lanczos.h"
-#include "gegl-sampler-downsharp.h"
-#include "gegl-sampler-downsize.h"
-#include "gegl-sampler-downsmooth.h"
 #include "gegl-sampler-upsharp.h"
 #include "gegl-sampler-upsize.h"
 #include "gegl-sampler-upsmooth.h"
diff --git a/gegl/buffer/gegl-buffer.c b/gegl/buffer/gegl-buffer.c
index 31664f2..4fd9d8d 100644
--- a/gegl/buffer/gegl-buffer.c
+++ b/gegl/buffer/gegl-buffer.c
@@ -63,9 +63,6 @@
 #include "gegl-sampler-linear.h"
 #include "gegl-sampler-cubic.h"
 #include "gegl-sampler-lanczos.h"
-#include "gegl-sampler-downsharp.h"
-#include "gegl-sampler-downsize.h"
-#include "gegl-sampler-downsmooth.h"
 #include "gegl-sampler-upsharp.h"
 #include "gegl-sampler-upsize.h"
 #include "gegl-sampler-upsmooth.h"
diff --git a/gegl/buffer/gegl-buffer.h b/gegl/buffer/gegl-buffer.h
index 76a82a0..4f9a97f 100644
--- a/gegl/buffer/gegl-buffer.h
+++ b/gegl/buffer/gegl-buffer.h
@@ -297,9 +297,6 @@ typedef enum {
   GEGL_INTERPOLATION_LINEAR,
   GEGL_INTERPOLATION_CUBIC,
   GEGL_INTERPOLATION_LANCZOS,
-  GEGL_INTERPOLATION_DOWNSHARP,
-  GEGL_INTERPOLATION_DOWNSIZE,
-  GEGL_INTERPOLATION_DOWNSMOOTH,
   GEGL_INTERPOLATION_UPSHARP,
   GEGL_INTERPOLATION_UPSIZE,
   GEGL_INTERPOLATION_UPSMOOTH
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index 719d090..7f563a2 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-downsharp.h"
-#include "gegl-sampler-downsize.h"
-#include "gegl-sampler-downsmooth.h"
 #include "gegl-sampler-upsharp.h"
 #include "gegl-sampler-upsize.h"
 #include "gegl-sampler-upsmooth.h"
@@ -465,15 +462,6 @@ gegl_buffer_interpolation_from_string (const gchar *string)
       g_str_equal (string, "bicubic"))
     return GEGL_INTERPOLATION_CUBIC;
 
-  if (g_str_equal (string, "downsharp"))
-    return GEGL_INTERPOLATION_DOWNSHARP;
-
-  if (g_str_equal (string, "downsize"))
-    return GEGL_INTERPOLATION_DOWNSIZE;
-
-  if (g_str_equal (string, "downsmooth"))
-    return GEGL_INTERPOLATION_DOWNSMOOTH;
-
   if (g_str_equal (string, "upsharp"))
     return GEGL_INTERPOLATION_UPSHARP;
 
@@ -499,12 +487,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_DOWNSHARP:
-        return GEGL_TYPE_SAMPLER_DOWNSHARP;
-      case GEGL_INTERPOLATION_DOWNSIZE:
-        return GEGL_TYPE_SAMPLER_DOWNSIZE;
-      case GEGL_INTERPOLATION_DOWNSMOOTH:
-        return GEGL_TYPE_SAMPLER_DOWNSMOOTH;
       case GEGL_INTERPOLATION_UPSHARP:
         return GEGL_TYPE_SAMPLER_UPSHARP;
       case GEGL_INTERPOLATION_UPSIZE:
diff --git a/gegl/buffer/gegl-sampler.h b/gegl/buffer/gegl-sampler.h
index 9600c7e..49cc133 100644
--- a/gegl/buffer/gegl-sampler.h
+++ b/gegl/buffer/gegl-sampler.h
@@ -47,7 +47,7 @@ struct _GeglSampler
   GeglRectangle  context_rect;
   void          *sampler_buffer;
   GeglRectangle  sampler_rectangle;
-  GeglMatrix2   *inverse_jacobian;
+  gdouble       *inverse_jacobian;
   gdouble        x; /* mirrors the currently requested */
   gdouble        y; /* coordinates in the instance     */
 };
diff --git a/gegl/gegl-matrix.h b/gegl/gegl-matrix.h
index cb8fb77..c5d8624 100644
--- a/gegl/gegl-matrix.h
+++ b/gegl/gegl-matrix.h
@@ -17,7 +17,6 @@ G_BEGIN_DECLS
  */
 
 typedef gdouble GeglMatrix3 [3][3];
-typedef gdouble GeglMatrix2 [2][2];
 
 /**
  * gegl_matrix3_identity:
diff --git a/operations/affine/affine.c b/operations/affine/affine.c
index 42ca40e..71b0fe6 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, downsharp, downsize, downsmooth, upsharp, upsize, upsmooth)"),
+                                     _("Filter type (nearest, linear, lanczos, cubic, upsharp, upsize, upsmooth)"),
                                      "linear",
                                      G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, PROP_HARD_EDGES,
@@ -681,7 +681,7 @@ affine_generic (GeglBuffer  *dest,
   gfloat               *dest_buf,
                        *dest_ptr;
   GeglMatrix3           inverse;
-  GeglMatrix2           inverse_jacobian;
+  gdouble               inverse_jacobian[4];
   gdouble               u_start,
                         v_start,
                         u_float,
@@ -709,13 +709,13 @@ affine_generic (GeglBuffer  *dest,
 
       gegl_matrix3_copy (inverse, matrix);
       gegl_matrix3_invert (inverse);
-      inverse_jacobian[0][0] = inverse[0][0];
-      inverse_jacobian[0][1] = inverse[0][1];
-      inverse_jacobian[1][0] = inverse[1][0];
-      inverse_jacobian[1][1] = inverse[1][1];
+      inverse_jacobian[0] = inverse[0][0];
+      inverse_jacobian[1] = inverse[0][1];
+      inverse_jacobian[2] = inverse[1][0];
+      inverse_jacobian[3] = inverse[1][1];
 
      /* set inverse_jacobian for samplers that support it */
-      sampler->inverse_jacobian = &inverse_jacobian;
+      sampler->inverse_jacobian = inverse_jacobian;
 
       u_start = inverse[0][0] * roi->x + inverse[0][1] * roi->y + inverse[0][2];
       v_start = inverse[1][0] * roi->x + inverse[1][1] * roi->y + inverse[1][2];
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]