Patch from codedread. Prevents rendering of title/desc/metadata elements in text...

[inkscape.git] / src / display / nr-filter-primitive.cpp

diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp
index e69a499d46beea4c15d7d872015a512ceff249f1..32467e3decbe956d151fd5df69b57d30a4f21a63 100644 (file)
--- a/src/display/nr-filter-primitive.cpp
+++ b/src/display/nr-filter-primitive.cpp
@@ -23,10 +23,12 @@ FilterPrimitive::FilterPrimitive()
     _input = NR_FILTER_SLOT_NOT_SET;
     _output = NR_FILTER_SLOT_NOT_SET;
 
+    // These defaults are according to SVG standard.
+    // NB: SVGLength.set takes prescaled percent values: 1 means 100%
     _region_x.set(SVGLength::PERCENT, 0, 0);
     _region_y.set(SVGLength::PERCENT, 0, 0);
-    _region_width.set(SVGLength::PERCENT, 100, 0);
-    _region_height.set(SVGLength::PERCENT, 100, 0);
+    _region_width.set(SVGLength::PERCENT, 1, 0);
+    _region_height.set(SVGLength::PERCENT, 1, 0);
 }
 
 FilterPrimitive::~FilterPrimitive()
@@ -34,19 +36,9 @@ FilterPrimitive::~FilterPrimitive()
     // Nothing to do here
 }
 
-int FilterPrimitive::render(NRPixBlock **pb, NRMatrix const *trans) {
-    if(trans) {
-        return this->render(pb, *trans);
-    } else {
-        Matrix tmp;
-        tmp.set_identity();
-        return this->render(pb, tmp);
-    }
-}
-
-int FilterPrimitive::get_enlarge(Matrix const &m)
+void FilterPrimitive::area_enlarge(NRRectL &/*area*/, Matrix const &/*m*/)
 {
-    return 0;
+    // This doesn't need to do anything by default
 }
 
 void FilterPrimitive::set_input(int slot) {
@@ -54,13 +46,17 @@ void FilterPrimitive::set_input(int slot) {
 }
 
 void FilterPrimitive::set_input(int input, int slot) {
-    if (slot == 0) _input = slot;
+    if (input == 0) _input = slot;
 }
 
 void FilterPrimitive::set_output(int slot) {
     if (slot >= 0) _output = slot;
 }
 
+FilterTraits FilterPrimitive::get_input_traits() {
+    return TRAIT_ANYTHING;
+}
+
 } /* namespace NR */
 
 /*