From 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 11 Oct 2008 11:16:23 -0400
Subject: Merging from trunk

(bzr r6884)
---
 src/trace/trace.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/trace/trace.cpp')

diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 95c144e28..33e4ea3a1 100644
--- 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);
-- 
cgit v1.2.3