[gegl-gtk] Remove code for old GEGL versions



commit 828051c9d8af05924f764ae0d40024a3134667a5
Author: Michael Henning <drawoc darkrefraction com>
Date:   Wed Aug 7 22:20:10 2013 -0400

    Remove code for old GEGL versions
    
    The build system already requires gegl-0.3

 configure.ac                    |    4 ++--
 gegl-gtk/internal/view-helper.c |   19 -------------------
 operations/gegl-gtk-display.c   |    9 +--------
 3 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f287209..753e7eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ m4_define([gegl_gtk_stable],
 
 # required versions of external libraries
 m4_define([babl_required_version], [0.1.4])
-m4_define([gegl_required_version], [0.1.6])
+m4_define([gegl_required_version], [0.3.0])
 m4_define([glib_required_version], [2.22.0])
 m4_define([gtk2_required_version], [2.18.0])
 m4_define([gtk3_required_version], [3.0.0])
@@ -109,7 +109,7 @@ AC_SUBST(PACKAGE_NAME)
 GEGL_PLUGINS_DIR=`pkg-config gegl-0.3 --variable=pluginsdir`
 if test -z $GEGL_PLUGINS_DIR; then
        GEGL_PREFIX=`pkg-config gegl --variable=prefix`
-       GEGL_PLUGINS_DIR=$GEGL_PREFIX/lib/gegl-0.1
+       GEGL_PLUGINS_DIR=$GEGL_PREFIX/lib/gegl-0.3
 fi
 AC_SUBST(GEGL_PLUGINS_DIR)
 
diff --git a/gegl-gtk/internal/view-helper.c b/gegl-gtk/internal/view-helper.c
index e6637c2..498e117 100644
--- a/gegl-gtk/internal/view-helper.c
+++ b/gegl-gtk/internal/view-helper.c
@@ -417,11 +417,6 @@ void view_helper_get_transformation(ViewHelper *self, GeglMatrix3 *matrix)
     /* XXX: Below gives the right result, but is it really the
      * way we want transformations to work? */
 
-    /* API change in GEGL 1.7 (1.6+git):
-     * GeglMatrix3 changed from float[3][3] to
-     * struct with a float[3][3] coeff member */
-
-#if GEGL_MINOR_VERSION == 1 && GEGL_MICRO_VERSION >= 7 || GEGL_MINOR_VERSION >= 2
     matrix->coeff [0][0] = self->scale; /* xx */
     matrix->coeff [0][1] = 0.0; /* xy */
     matrix->coeff [0][2] = -self->x; /* x0 */
@@ -433,20 +428,6 @@ void view_helper_get_transformation(ViewHelper *self, GeglMatrix3 *matrix)
     matrix->coeff [2][0] = 0.0;
     matrix->coeff [2][1] = 0.0;
     matrix->coeff [2][2] = 1.0;
-#else
-    (*matrix) [0][0] = self->scale;
-    (*matrix) [0][1] = 0.0;
-    (*matrix) [0][2] = -self->x;
-
-    (*matrix) [1][0] = 0.0;
-    (*matrix) [1][1] = self->scale;
-    (*matrix) [1][2] = -self->y;
-
-    (*matrix) [2][0] = 0.0;
-    (*matrix) [2][1] = 0.0;
-    (*matrix) [2][2] = 1.0;
-#endif
-
 }
 
 void
diff --git a/operations/gegl-gtk-display.c b/operations/gegl-gtk-display.c
index d17576d..a073197 100644
--- a/operations/gegl-gtk-display.c
+++ b/operations/gegl-gtk-display.c
@@ -150,18 +150,11 @@ gegl_chant_class_init(GeglChantClass *klass)
 #define OPERATION_NAME "gegl-gtk3:display"
 #endif
 
-#if GEGL_MINOR_VERSION >= 2 && GEGL_MICRO_VERSION >= 0
     gegl_operation_class_set_keys (operation_class,
         "name", OPERATION_NAME ,
         "categories", "output",
-        "description", _("Displays the input buffer in an GTK window ."),
+        "description", _("Displays the input buffer in an GTK window."),
         NULL);
-#else /* GEGL < 0.2.0 */
-    operation_class->name        = OPERATION_NAME;
-    operation_class->categories  = "output";
-    operation_class->description =
-        _("Displays the input buffer in an GTK window .");
-#endif
 
 }
 


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