Updating to current trunk

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

diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index afa9f798c87b3d8b5a9d92e9a8cb72ffffad8a83..f3565ef9f756899b5455f198f1c236b794434fd7 100644 (file)
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -16,8 +16,10 @@
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 #include <gtkmm.h>
+#include "sp-item.h"
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 class FilterImage : public FilterPrimitive {
 public:
@@ -30,6 +32,9 @@ public:
     void set_document( SPDocument *document );
     void set_href(const gchar *href);
     void set_region(SVGLength x, SVGLength y, SVGLength width, SVGLength height);
+    bool from_element;
+    SPItem* SVGElem;
+
 private:
     SPDocument *document;
     gchar *feImageHref;
@@ -37,9 +42,11 @@ private:
     Glib::RefPtr<Gdk::Pixbuf> image;
     int width, height, rowstride;
     float feImageX,feImageY,feImageWidth,feImageHeight;
+    bool has_alpha;
 };
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 #endif /* __NR_FILTER_IMAGE_H__ */
 /*