Merging from trunk

[inkscape.git] / src / livarot / PathStroke.cpp

diff --git a/src/livarot/PathStroke.cpp b/src/livarot/PathStroke.cpp
index f4ece6892d75f42fd964235698d1fdbccab56615..e9f2ae6776f31c0a7989e0dac3b9f13f0adb449e 100644 (file)
--- a/src/livarot/PathStroke.cpp
+++ b/src/livarot/PathStroke.cpp
@@ -8,7 +8,7 @@
 
 #include "Path.h"
 #include "Shape.h"
-#include <libnr/nr-rotate-ops.h>
+#include <2geom/transforms.h>
 
 /*
  * stroking polylines into a Shape instance
@@ -729,7 +729,7 @@ void Path::RecRound(Shape *dest, int sNo, int eNo, // start and end index
     ang /= lod;
 
     int nbS = (int) floor(ang);
-    NR::rotate omega(((sia > 0) ? -lod : lod));
+    Geom::Rotate omega(((sia > 0) ? -lod : lod));
     NR::Point cur = iS - origine;
     //  StrokeNormalize(cur);
     //  cur*=width;