Updating to current trunk

[inkscape.git] / src / display / nr-filter-morphology.h

diff --git a/src/display/nr-filter-morphology.h b/src/display/nr-filter-morphology.h
index 7283b0cea8990a770c3166c0f5f4d0eafc41594a..1d3e16be3ec4727ecf0f009a1ec00925c5ac75a4 100644 (file)
--- a/src/display/nr-filter-morphology.h
+++ b/src/display/nr-filter-morphology.h
@@ -14,8 +14,10 @@
 
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
+#include "display/nr-filter-units.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 enum FilterMorphologyOperator {
     MORPHOLOGY_OPERATOR_ERODE,
@@ -29,20 +31,21 @@ public:
     static FilterPrimitive *create();
     virtual ~FilterMorphology();
 
-    virtual int render(FilterSlot &slot, Matrix const &trans);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual int render(FilterSlot &slot, FilterUnits const &units);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual FilterTraits get_input_traits();
     void set_operator(FilterMorphologyOperator &o);
-    void set_xradius(int x);
-    void set_yradius(int y);
+    void set_xradius(double x);
+    void set_yradius(double y);
 
 private:
     FilterMorphologyOperator Operator;
-    int xradius;
-    int yradius;
+    double xradius;
+    double yradius;
 };
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 #endif /* __NR_FILTER_MORPHOLOGY_H__ */
 /*