No more NRMatrix or NRPoint.

[inkscape.git] / src / filter-chemistry.cpp

diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index b9ff1287b9bdbc4bc08497b413ec180fdf56f206..46dbfe0f50c8ee58ff11d9811269fdbe1733ba59 100644 (file)
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -26,6 +26,7 @@
 #include "sp-filter-reference.h"
 #include "sp-gaussian-blur.h"
 #include "svg/css-ostringstream.h"
+#include "libnr/nr-matrix-fns.h"
 
 #include "xml/repr.h"
 
@@ -331,7 +332,7 @@ new_filter_simple_from_item (SPDocument *document, SPItem *item, const char *mod
 
     NR::Matrix i2d = sp_item_i2d_affine (item);
 
-    return (new_filter_blend_gaussian_blur (document, mode, radius, i2d.expansion(), i2d.expansionX(), i2d.expansionY(), width, height));
+    return (new_filter_blend_gaussian_blur (document, mode, radius, NR::expansion(i2d), NR::expansionX(i2d), NR::expansionY(i2d), width, height));
 }
 
 /**
@@ -367,7 +368,7 @@ modify_filter_gaussian_blur_from_item(SPDocument *document, SPItem *item,
 
     // Determine the required standard deviation value
     NR::Matrix i2d = sp_item_i2d_affine (item);
-    double expansion = i2d.expansion();
+    double expansion = NR::expansion(i2d);
     double stdDeviation = radius;
     if (expansion != 0)
         stdDeviation /= expansion;
@@ -385,8 +386,8 @@ modify_filter_gaussian_blur_from_item(SPDocument *document, SPItem *item,
 
     // Set the filter effects area
     Inkscape::XML::Node *repr = SP_OBJECT_REPR(item->style->getFilter());
-    set_filter_area(repr, radius, expansion, i2d.expansionX(),
-                    i2d.expansionY(), width, height);
+    set_filter_area(repr, radius, expansion, NR::expansionX(i2d),
+                    NR::expansionY(i2d), width, height);
 
     // Search for gaussian blur primitives. If found, set the stdDeviation
     // of the first one and return.