Filters. New global filters file, and some SVG fixes.

(bzr r10542)

6 files changed, 12 insertions, 12 deletions

diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index b8617eafc..c80ca004a 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -701,7 +701,7 @@ WaxBump::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feFlood in=\"SourceGraphic\" flood-opacity=\"1\" flood-color=\"rgb(255,255,255)\" result=\"flood1\" />\n"
           "<feColorMatrix in=\"%s\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 %s \" result=\"colormatrix1\" />\n"
           "<feColorMatrix in=\"blur1\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 %s %s %s %s 0 \" result=\"colormatrix2\" />\n"
-          "<feFlood stdDeviation=\"1\" flood-color=\"rgb(%s,%s,%s)\" flood-opacity=\"%s\" result=\"flood2\" />\n"
+          "<feFlood flood-color=\"rgb(%s,%s,%s)\" flood-opacity=\"%s\" result=\"flood2\" />\n"
           "<feComposite in=\"flood2\" in2=\"colormatrix2\" stdDeviation=\"1\" operator=\"%s\" result=\"composite1\" />\n"
           "<feGaussianBlur in=\"composite1\" stdDeviation=\"%s\" result=\"blur2\" />\n"
           "<feSpecularLighting in=\"blur2\" lighting-color=\"rgb(%s,%s,%s)\" specularConstant=\"%s\" surfaceScale=\"%s\" specularExponent=\"%s\" result=\"specular\">\n"
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index e9aea4ed2..9ffb74e04 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -1234,7 +1234,7 @@ Solarize::get_filter_text (Inkscape::Extension::Extension * ext)
     * Option (enum, default Normal) ->
         Normal = composite1 (in="qminp", in2="flood"), composite2 (in="p", in2="blend6"), blend6 (in2="qminpc")
         Enhance hue = Normal + composite2 (in="SourceGraphic")
-        Radiation = Normal + blend6 (in2="SourceGraphic") composite2 (in="blend6", in2="qminpc")
+        Phosphorescence = Normal + blend6 (in2="SourceGraphic") composite2 (in="blend6", in2="qminpc")
         Hue to background = Normal + composite1 (in2="BackgroundImage") [a template with an activated background is needed, or colors become black]
     * Hue distribution (0->360, default 0) -> colormatrix1 (values)
     * Colors (guint, default -73203457) -> flood (flood-opacity, flood-color)
@@ -1263,7 +1263,7 @@ public:
                   "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"enhue\">" N_("Enhance hue") "</_item>\n"
-                    "<_item value=\"rad\">" N_("Radiation") "</_item>\n"
+                    "<_item value=\"rad\">" N_("Phosphorescence") "</_item>\n"
                     "<_item value=\"htb\">" N_("Hue to background") "</_item>\n"
                   "</param>\n"
                   "<param name=\"globalblend\" gui-text=\"" N_("Global blend:") "\" type=\"enum\">\n"
@@ -1342,7 +1342,7 @@ Tritone::get_filter_text (Inkscape::Extension::Extension * ext)
         c2in2 << "blend6";
         b6in2 << "qminpc";
     } else if ((g_ascii_strcasecmp("rad", type) == 0)) {
-    // Radiation
+    // Phosphorescence
         c1in << "qminp";
         c1in2 << "flood";
         c2in << "blend6";
@@ -1379,7 +1379,7 @@ Tritone::get_filter_text (Inkscape::Extension::Extension * ext)
           "</feComponentTransfer>\n"
           "<feBlend in2=\"q2\" mode=\"%s\" in=\"p\" result=\"pq\" />\n"
           "<feColorMatrix in=\"pq\" result=\"qminp\" type=\"matrix\" values=\"-1 1 0 0 0 -1 1 0 0 0 -1 1 0 0 0 0 0 0 0 1 \" />\n"
-          "<feFlood in=\"qminp\" flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
+          "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feComposite in=\"%s\" in2=\"%s\" result=\"qminpc\" operator=\"arithmetic\" k1=\"1\" />\n"
           "<feGaussianBlur stdDeviation=\"%s\" />\n"
           "<feBlend in2=\"%s\" blend=\"normal\" result=\"blend6\" mode=\"%s\" />\n"
diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index 59c33f586..d893ae635 100644
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -182,7 +182,7 @@ Outline::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feColorMatrix result=\"color1\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 200 -1 \" />\n"
           "<feGaussianBlur in=\"color1\" stdDeviation=\"%s\" result=\"blur2\" />\n"
           "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"color2\" />\n"
-          "<feFlood in=\"color2\" result=\"flood\" flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" />\n"
+          "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feComposite in=\"flood\" in2=\"color2\" operator=\"in\" result=\"composite\" />\n"
           "<feBlend in=\"SourceGraphic\" in2=\"composite\" mode=\"normal\" blend=\"normal\" />\n"
         "</filter>\n", width.str().c_str(), melt.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str());
diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h
index 0d02777d1..12e7b5985 100644
--- a/src/extension/internal/filter/overlays.h
+++ b/src/extension/internal/filter/overlays.h
@@ -127,7 +127,7 @@ NoiseFill::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feTurbulence type=\"%s\" baseFrequency=\"%s %s\" numOctaves=\"%s\" seed=\"%s\" result=\"turbulence\"/>\n"
           "<feComposite in=\"SourceGraphic\" in2=\"turbulence\" operator=\"%s\" result=\"composite1\" />\n"
           "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"color\" />\n"
-          "<feFlood in=\"color\" flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
+          "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feMerge result=\"merge\">\n"
             "<feMergeNode in=\"flood\" />\n"
             "<feMergeNode in=\"color\" />\n"
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index 7c3bbfcd3..7fc241623 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -704,13 +704,13 @@ public:
                   "</param>\n"
                   "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
                   "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
-                  "<param name=\"complexity\" gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">3</param>\n"
+                  "<param name=\"complexity\" gui-text=\"" N_("Complexity:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"5\">1</param>\n"
                   "<param name=\"variation\" gui-text=\"" N_("Variation:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"100\">0</param>\n"
                   "<param name=\"reduction\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"500\">45</param>\n"
                   "<param name=\"blend\" gui-text=\"" N_("Noise blend:") "\" type=\"enum\">\n"
+                    "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"screen\">" N_("Screen") "</_item>\n"
-                    "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
                     "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
                     "<_item value=\"darken\">" N_("Darken") "</_item>\n"
                   "</param>\n"
@@ -723,7 +723,7 @@ public:
                   "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">1229269247</param>\n"
                 "</page>\n"
                 "<page name=\"bgcolortab\" _gui-text=\"Background color\">\n"
-                  "<param name=\"bgcolor\" gui-text=\"" N_("Color") "\" type=\"color\">255</param>\n"
+                  "<param name=\"bgcolor\" gui-text=\"" N_("Color") "\" type=\"color\">-16843009</param>\n"
                 "</page>\n"
               "</param>\n"
               "<effect>\n"
@@ -798,7 +798,7 @@ PointEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feComposite in=\"turbulence\" in2=\"colormatrix1\" k1=\"%s\" k2=\"%s\" k4=\"%s\" operator=\"arithmetic\" result=\"composite1\" />\n"
           "<feColorMatrix in=\"composite1\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 10 -9 \" result=\"colormatrix2\" />\n"
           "<feGaussianBlur stdDeviation=\"%s\" result=\"blur\" />\n"
-          "<feFlood in=\"blur\" flood-color=\"rgb(%s,%s,%s)\" flood-opacity=\"%s\" result=\"flood1\" />\n"
+          "<feFlood flood-color=\"rgb(%s,%s,%s)\" flood-opacity=\"%s\" result=\"flood1\" />\n"
           "<feComposite in=\"flood1\" in2=\"blur\" operator=\"out\" stdDeviation=\"2\" result=\"composite2\" />\n"
           "<feFlood in=\"blur\" flood-color=\"rgb(%s,%s,%s)\" flood-opacity=\"%s\" result=\"flood2\" />\n"
           "<feComposite in2=\"blur\" operator=\"in\" result=\"composite3\" />\n"
diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h
index 9fd6cac22..a73191bcc 100644
--- a/src/extension/internal/filter/transparency.h
+++ b/src/extension/internal/filter/transparency.h
@@ -243,7 +243,7 @@ Silhouette::get_filter_text (Inkscape::Extension::Extension * ext)
 
     _filter = g_strdup_printf(
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" inkscape:label=\"Silhouette\">\n"
-          "<feFlood in=\"SourceGraphic\" flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
+          "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feComposite in=\"flood\" in2=\"SourceGraphic\" operator=\"%s\" result=\"composite\" />\n"
           "<feGaussianBlur stdDeviation=\"%s\" />\n"
         "</filter>\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), cutout.str().c_str(), blur.str().c_str());