switch SPStyle to using SPFilterReference for filters; sp_style_new now requires an SPDocument; SPURIReference and SPFilterReference have an alternative constructor taking an owner_document instead of owner object

(bzr r3116)

3 files changed, 12 insertions, 9 deletions

diff --git a/src/display/nr-arena-group.cpp b/src/display/nr-arena-group.cpp
index da3a240a6..3f08f42f4 100644
--- a/src/display/nr-arena-group.cpp
+++ b/src/display/nr-arena-group.cpp
@@ -18,6 +18,7 @@
 #include "display/nr-filter-types.h"
 #include "style.h"
 #include "sp-filter.h"
+#include "sp-filter-reference.h"
 #include "sp-gaussian-blur.h"
 #include "sp-feblend.h"
 #include "display/nr-filter-blend.h"
@@ -195,12 +196,12 @@ void nr_arena_group_set_style (NRArenaGroup *group, SPStyle *style)
     group->style = style;
 
     //if group has a filter
-    if (style->filter.set && style->filter.filter) {
+    if (style->filter.set && style->filter.href->getObject()) {
         if (!group->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.filter);
+            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
             group->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.filter, group->filter);
+        sp_filter_build_renderer(style->filter.href->getObject(), group->filter);
     } else {
         //no filter set for this group
         delete group->filter;
diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp
index 5f22dc5cd..87cc94e1b 100644
--- a/src/display/nr-arena-image.cpp
+++ b/src/display/nr-arena-image.cpp
@@ -23,6 +23,7 @@
 #include <livarot/Path.h>
 #include <livarot/Shape.h>
 #include "sp-filter.h"
+#include "sp-filter-reference.h"
 #include "sp-gaussian-blur.h"
 #include "sp-feblend.h"
 #include "display/nr-filter-blend.h"
@@ -368,12 +369,12 @@ void nr_arena_image_set_style (NRArenaImage *image, SPStyle *style)
     image->style = style;
 
     //if image has a filter
-    if (style->filter.set && style->filter.filter) {
+    if (style->filter.set && style->filter.href->getObject()) {
         if (!image->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.filter);
+            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
             image->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.filter, image->filter);
+        sp_filter_build_renderer(style->filter.href->getObject(), image->filter);
     } else {
         //no filter set for this image
         delete image->filter;
diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index c09bdb9dd..0e7dd2798 100644
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -31,6 +31,7 @@
 #include "inkscape-cairo.h"
 
 #include "sp-filter.h"
+#include "sp-filter-reference.h"
 #include "display/nr-filter.h"
 
 #include <cairo.h>
@@ -1359,12 +1360,12 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style)
     shape->setMitreLimit(style->stroke_miterlimit.value);
 
     //if shape has a filter
-    if (style->filter.set && style->filter.filter) {
+    if (style->filter.set && style->filter.href->getObject()) {
         if (!shape->filter) {
-            int primitives = sp_filter_primitive_count(style->filter.filter);
+            int primitives = sp_filter_primitive_count(style->filter.href->getObject());
             shape->filter = new NR::Filter(primitives);
         }
-        sp_filter_build_renderer(style->filter.filter, shape->filter);
+        sp_filter_build_renderer(style->filter.href->getObject(), shape->filter);
     } else {
         //no filter set for this shape
         delete shape->filter;