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)

1 files changed, 4 insertions, 3 deletions

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;