New grids are almost ready to fly!

[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..890cb96fe7ad81399c9c7a0422a24272373fc7a1 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,13 +36,14 @@ FilterPrimitive::~FilterPrimitive()
     // Nothing to do here
 }
 
-int FilterPrimitive::render(NRPixBlock **pb, NRMatrix const *trans) {
+/** Wrapper function for rendering with C-style matrices. */
+int FilterPrimitive::render(FilterSlot &slot, NRMatrix const *trans) {
     if(trans) {
-        return this->render(pb, *trans);
+        return this->render(slot, *trans);
     } else {
         Matrix tmp;
         tmp.set_identity();
-        return this->render(pb, tmp);
+        return this->render(slot, tmp);
     }
 }
 
@@ -54,7 +57,7 @@ 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) {