filterUnits and primitiveUnits are now actually read/set, percentages for primitiveUn...

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

diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index 83601a5acdf8b64668214d4ffaed6c06ea62fe6f..bb15b77a3c200c8a2cd98c122de61716390ea28e 100644 (file)
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -5,19 +5,21 @@
  * feDisplacementMap filter primitive renderer
  *
  * Authors:
- *   Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
+ *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2007 authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "filters/displacementmap.h"
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
-#include "libnr/nr-matrix.h"
+#include "display/nr-filter-units.h"
 #include "libnr/nr-rect-l.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 class FilterDisplacementMap : public FilterPrimitive {
 public:
@@ -28,19 +30,20 @@ public:
     virtual void set_input(int slot);
     virtual void set_input(int input, int slot);
     virtual void set_scale(double s);
-    virtual void set_channel_selector(int channel, int s);
-    virtual int render(FilterSlot &slot, Matrix const &trans);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void set_channel_selector(int s, FilterDisplacementMapChannelSelector channel);
+    virtual int render(FilterSlot &slot, FilterUnits const &units);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 
 private:
     double scale;
     int _input2;
-    int Xchannel;
-    int Ychannel;
-    int out_x0, out_y0, out_w, out_h;
+    FilterDisplacementMapChannelSelector Xchannel;
+    FilterDisplacementMapChannelSelector Ychannel;
 };
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 #endif /* __NR_FILTER_DISPLACEMENT_MAP_H__ */
 /*