Merging from trunk

[inkscape.git] / src / trace / trace.cpp

diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 95c144e28b18b831023685a779ee699601fb8c18..33e4ea3a14c4fda57d0320128dcdcb880105e778 100644 (file)
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -28,7 +28,7 @@
 #include <sp-shape.h>
 #include <sp-image.h>
 #include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-scale-translate-ops.h>
+#include <2geom/transforms.h>
 
 #include <display/nr-arena.h>
 #include <display/nr-arena-shape.h>
@@ -507,8 +507,8 @@ void Tracer::traceThread()
     double iwscale = width  / iwidth;
     double ihscale = height / iheight;
 
-    NR::translate trans(x, y);
-    NR::scale scal(iwscale, ihscale);
+    Geom::Translate trans(x, y);
+    Geom::Scale scal(iwscale, ihscale);
 
     //# Convolve scale, translation, and the original transform
     NR::Matrix tf(scal * trans);