diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-11 15:16:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-11 15:16:23 +0000 |
| commit | 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch) | |
| tree | ca2e94164b6d7aaebfc17196ca46bfc825a7665a /src/trace/trace.cpp | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/trace/trace.cpp')
| -rw-r--r-- | src/trace/trace.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |