gaussian-blur: replace with the new one from workshop

6 files changed, 10 insertions, 8 deletions

diff --git a/operations/common/Makefile.am b/operations/common/Makefile.am
index adc52c21..7beab1e3 100644
--- a/operations/common/Makefile.am
+++ b/operations/common/Makefile.am
@@ -54,6 +54,8 @@ op_LTLIBRARIES = \
 	fractal-explorer.la \
 	fractal-trace.la \
 	gaussian-blur.la \
+	gaussian-blur-iir.la \
+	gblur-1d.la \
 	gegl-buffer-load-op.la \
 	gegl-buffer-save-op.la \
 	grey.la \
diff --git a/operations/common/dropshadow.c b/operations/common/dropshadow.c
index abd3a9d1..a7f96d92 100644
--- a/operations/common/dropshadow.c
+++ b/operations/common/dropshadow.c
@@ -69,11 +69,13 @@ attach (GeglOperation *operation)
   over      = gegl_node_new_child (gegl, "operation", "gegl:over", NULL);
   translate = gegl_node_new_child (gegl, "operation", "gegl:translate", NULL);
   opacity   = gegl_node_new_child (gegl, "operation", "gegl:opacity", NULL);
-  blur      = gegl_node_new_child (gegl, "operation", "gegl:gaussian-blur", NULL);
+  blur      = gegl_node_new_child (gegl, "operation", "gegl:gaussian-blur", 
+                                         "clip-extent", FALSE, NULL);
   darken    = gegl_node_new_child (gegl, "operation", "gegl:src-in", NULL);
   color     = gegl_node_new_child (gegl, "operation", "gegl:color",
                                    "value", black_color,
                                    NULL);
+
   g_object_unref (black_color);
 
   gegl_node_link_many (input, darken, blur, opacity, translate, over, output,
diff --git a/operations/workshop/gaussian-blur-iir.c b/operations/common/gaussian-blur-iir.c
index 96c8f2e9..c5f56c69 100644
--- a/operations/workshop/gaussian-blur-iir.c
+++ b/operations/common/gaussian-blur-iir.c
@@ -35,15 +35,15 @@ enum_start (gegl_gaussian_blur_policy)
 enum_end (GeglGaussianBlurPolicy)
 
 
-property_double (std_dev_x, _("Standard deviation X"), 1.5)
-   description (_("Standard deviation (spatial scale factor)"))
+property_double (std_dev_x, _("Size X"), 1.5)
+   description (_("Standard deviation for the horizontal axis"))
    value_range (0.0, 1500.0)
    ui_range    (0.24, 100.0)
    ui_gamma    (3.0)
    ui_meta     ("unit", "pixel-distance")
    ui_meta     ("axis", "x")
 
-property_double (std_dev_y, _("Standard deviation Y"), 1.5)
+property_double (std_dev_y, _("Size Y"), 1.5)
    description (_("Standard deviation (spatial scale factor)"))
    value_range (0.0, 1500.0)
    ui_range    (0.24, 100.0)
@@ -113,7 +113,7 @@ gegl_op_class_init (GeglOpClass *klass)
   operation_class->attach = attach;
 
   gegl_operation_class_set_keys (operation_class,
-    "name",        "gegl:gaussian-blur-iir",
+    "name",        "gegl:gaussian-blur",
     "categories",  "blur",
     "description", _("Performs an averaging of neighboring pixels with the "
                      "normal distribution as weighting"),
diff --git a/operations/common/gaussian-blur.c b/operations/common/gaussian-blur.c
index 434a4537..079a808e 100644
--- a/operations/common/gaussian-blur.c
+++ b/operations/common/gaussian-blur.c
@@ -699,7 +699,7 @@ gegl_op_class_init (GeglOpClass *klass)
   filter_class->process           = process;
 
   gegl_operation_class_set_keys (operation_class,
-    "name",        "gegl:gaussian-blur",
+    "name",        "gegl:gaussian-blur-old",
     "title",       _("Gaussian Blur"),
     "categories",  "blur",
     "description", _("Each result pixel is the average of the neighbouring pixels weighted by a normal distribution with specified standard deviation."),
diff --git a/operations/workshop/gblur-1d.c b/operations/common/gblur-1d.c
index 8cd14712..8cd14712 100644
--- a/operations/workshop/gblur-1d.c
+++ b/operations/common/gblur-1d.c
diff --git a/operations/workshop/Makefile.am b/operations/workshop/Makefile.am
index 04633477..a2e5b8ec 100644
--- a/operations/workshop/Makefile.am
+++ b/operations/workshop/Makefile.am
@@ -21,8 +21,6 @@ op_LTLIBRARIES =    \
 	demosaic-simple.la \
 	disc-percentile.la \
 	ditto.la \
-	gaussian-blur-iir.la \
-	gblur-1d.la \
 	hstack.la \
 	ink-simulator.la \
 	kuwahara.la \