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

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);
 

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,

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,

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		\

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 ();

operations/transform/scale.c

-/* This file is part of GEGL
- *
- * GEGL is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * GEGL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2006 Philip Lafleur
- */
-
-#include "config.h"
-#include <glib/gi18n-lib.h>
-
-/*  This operation is deprecated and is to be removed with the next version of GEGL.
- *  Use the scaleratio operation instead.
- */
-
-#ifdef GEGL_CHANT_PROPERTIES
-
-gegl_chant_double (x, -G_MAXDOUBLE, G_MAXDOUBLE, 1.0,
-                   _("Horizontal scale factor"))
-gegl_chant_double (y, -G_MAXDOUBLE, G_MAXDOUBLE, 1.0,
-                   _("Vertical scale factor"))
-
-#else
-
-#define GEGL_CHANT_NAME scale
-#define GEGL_CHANT_DESCRIPTION _("Scales the buffer.")
-#define GEGL_CHANT_SELF "scale.c"
-#include "chant.h"
-
-#include <math.h>
-
-static void
-create_matrix (OpTransform *op,
-               GeglMatrix3 *matrix)
-{
-  GeglChantOperation *chant = GEGL_CHANT_OPERATION (op);
-
-  matrix->coeff [0][0] = chant->x;
-  matrix->coeff [1][1] = chant->y;
-}
-
-#endif

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

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>

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>

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>

tests/compositions/rgbe-save.xml

 <?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>

tests/compositions/simple-scale.xml

 <?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>

tests/compositions/transform.xml

 <?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>