[gegl] operations: Remove gegl:scale in favor of gegl:scale-ratio



commit ecfb2a7709909ab151c7fb85e16ff1d0e96f60fb
Author: Michael Henning <drawoc darkrefraction com>
Date:   Sun Jun 9 13:46:31 2013 -0400

    operations: Remove gegl:scale in favor of gegl:scale-ratio

 bindings/gegl-sharp/sample/TestGegl.cs      |    2 +-
 examples/csugar.c                           |    2 +-
 operations/common/layer.c                   |    2 +-
 operations/transform/Makefile.am            |    1 -
 operations/transform/module.c               |    2 -
 operations/transform/scale.c                |   52 ---------------------------
 po/POTFILES.in                              |    1 -
 tests/compositions/affine-with-negative.xml |    2 +-
 tests/compositions/clones.xml               |   10 +++---
 tests/compositions/composite-transform.xml  |    2 +-
 tests/compositions/rgbe-save.xml            |    2 +-
 tests/compositions/simple-scale.xml         |    2 +-
 tests/compositions/transform.xml            |    2 +-
 13 files changed, 13 insertions(+), 69 deletions(-)
---
diff --git a/bindings/gegl-sharp/sample/TestGegl.cs b/bindings/gegl-sharp/sample/TestGegl.cs
index e5a40e5..38906d2 100644
--- a/bindings/gegl-sharp/sample/TestGegl.cs
+++ b/bindings/gegl-sharp/sample/TestGegl.cs
@@ -11,7 +11,7 @@ public class Test {
         Node load       = graph.CreateChild("gegl:load");
         load.SetProperty("path", "../../../docs/gallery/data/car-stack.jpg");
 
-        Node scale      = graph.CreateChild("gegl:scale");
+        Node scale      = graph.CreateChild("gegl:scale-ratio");
         scale.SetProperty("x", 0.50);
         scale.SetProperty("y", 0.50);
 
diff --git a/examples/csugar.c b/examples/csugar.c
index dce1521..21b00f1 100644
--- a/examples/csugar.c
+++ b/examples/csugar.c
@@ -22,7 +22,7 @@ main (gint argc,
     gegl_graph (
     sink = gegl_node ("gegl:png-save", "path", argv[3], NULL,
     gegl_node   ("gegl:over", NULL,
-      gegl_node ("gegl:scale",
+      gegl_node ("gegl:scale-ratio",
                  "x", 0.4,
                  "y", 0.4,
                  NULL,
diff --git a/operations/common/layer.c b/operations/common/layer.c
index 5af50f6..51a6fc6 100644
--- a/operations/common/layer.c
+++ b/operations/common/layer.c
@@ -236,7 +236,7 @@ static void attach (GeglOperation *operation)
                                          NULL);
 
   self->translate = gegl_node_new_child (gegl, "operation", "gegl:translate", NULL);
-  self->scale = gegl_node_new_child (gegl, "operation", "gegl:scale", NULL);
+  self->scale = gegl_node_new_child (gegl, "operation", "gegl:scale-ratio", NULL);
   self->opacity = gegl_node_new_child (gegl, "operation", "gegl:opacity", NULL);
 
   self->load = gegl_node_new_child (gegl,
diff --git a/operations/transform/Makefile.am b/operations/transform/Makefile.am
index 90012d7..ec7d2ef 100644
--- a/operations/transform/Makefile.am
+++ b/operations/transform/Makefile.am
@@ -13,7 +13,6 @@ transformops_la_SOURCES = \
        module.h        \
        reflect.c       \
        rotate.c        \
-       scale.c         \
        scale-ratio.c \
        scale-size.c \
        shear.c         \
diff --git a/operations/transform/module.c b/operations/transform/module.c
index 3d2398a..c9dae5a 100644
--- a/operations/transform/module.c
+++ b/operations/transform/module.c
@@ -40,7 +40,6 @@ gegl_module_query (GTypeModule *module)
 }
 
 GType rotate_get_type      (void);
-GType scale_get_type       (void);
 GType scale_ratio_get_type  (void);
 GType scale_size_get_type   (void);
 GType shear_get_type       (void);
@@ -56,7 +55,6 @@ gegl_module_register (GTypeModule *module)
 
   dummy = op_transform_get_type ();
   dummy = rotate_get_type ();
-  dummy = scale_get_type ();
   dummy = scale_ratio_get_type ();
   dummy = scale_size_get_type ();
   dummy = shear_get_type ();
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea6778a..973c512 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -155,7 +155,6 @@ operations/seamless-clone/seamless-clone.c
 operations/seamless-clone/seamless-clone-compose.c
 operations/transform/reflect.c
 operations/transform/rotate.c
-operations/transform/scale.c
 operations/transform/scale-ratio.c
 operations/transform/scale-size.c
 operations/transform/shear.c
diff --git a/tests/compositions/affine-with-negative.xml b/tests/compositions/affine-with-negative.xml
index 904d175..4c9ab87 100644
--- a/tests/compositions/affine-with-negative.xml
+++ b/tests/compositions/affine-with-negative.xml
@@ -20,7 +20,7 @@
       <param name='height'>1024</param>
     </params>
   </node>
-  <node operation='gegl:scale'>
+  <node operation='gegl:scale-ratio'>
     <params>
       <param name='sampler'>linear</param>
       <param name='x'>-4</param>
diff --git a/tests/compositions/clones.xml b/tests/compositions/clones.xml
index 7aa378e..c10d31a 100644
--- a/tests/compositions/clones.xml
+++ b/tests/compositions/clones.xml
@@ -7,7 +7,7 @@
             <param name='y'>280.000000</param>
           </params>
       </node>
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
@@ -39,7 +39,7 @@
             <param name='value'>2.500000</param>
           </params>
       </node>
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
@@ -59,7 +59,7 @@
       </node>
       <node operation='gegl:invert'>
       </node>
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
@@ -82,7 +82,7 @@
             <param name='value'>0.500000</param>
           </params>
       </node>
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
@@ -152,7 +152,7 @@
           <clone ref='clone1'/>
       </node>
       -->
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
diff --git a/tests/compositions/composite-transform.xml b/tests/compositions/composite-transform.xml
index 43c92d6..ee1d2cf 100644
--- a/tests/compositions/composite-transform.xml
+++ b/tests/compositions/composite-transform.xml
@@ -9,7 +9,7 @@
       </node>
       <!-- Used to break the composition, to render initial reference 
       <node operation='gegl:nop'/>  -->
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>
diff --git a/tests/compositions/rgbe-save.xml b/tests/compositions/rgbe-save.xml
index 17476d0..194795d 100644
--- a/tests/compositions/rgbe-save.xml
+++ b/tests/compositions/rgbe-save.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gegl>
-  <node operation='gegl:scale'>
+  <node operation='gegl:scale-ratio'>
     <params>
       <param name='x'>0.25</param>
       <param name='y'>0.25</param>
diff --git a/tests/compositions/simple-scale.xml b/tests/compositions/simple-scale.xml
index dfff358..0f77108 100644
--- a/tests/compositions/simple-scale.xml
+++ b/tests/compositions/simple-scale.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gegl>
-  <node operation='gegl:scale'>
+  <node operation='gegl:scale-ratio'>
     <params>
       <param name='sampler'>cubic</param>
       <param name='x'>0.5</param>
diff --git a/tests/compositions/transform.xml b/tests/compositions/transform.xml
index 7191099..4aef2ae 100644
--- a/tests/compositions/transform.xml
+++ b/tests/compositions/transform.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gegl>
   <node operation='gegl:over'>
-      <node operation='gegl:scale'>
+      <node operation='gegl:scale-ratio'>
           <params>
             <param name='origin-x'>0.000000</param>
             <param name='origin-y'>0.000000</param>


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