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/svg/svg-affine.cpp | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/svg/svg-affine.cpp')
| -rw-r--r-- | src/svg/svg-affine.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index a34736176..2445135c3 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -24,12 +24,8 @@ #include <glib/gstrfuncs.h> #include <libnr/nr-matrix-fns.h> #include <libnr/nr-matrix-ops.h> -#include <libnr/nr-matrix-translate-ops.h> -#include <libnr/nr-rotate-fns.h> -#include <libnr/nr-rotate-matrix-ops.h> -#include <libnr/nr-scale-matrix-ops.h> -#include <libnr/nr-translate-matrix-ops.h> -#include <libnr/nr-translate-rotate-ops.h> +#include <2geom/transforms.h> +#include <2geom/angle.h> #include <libnr/nr-convert2geom.h> #include "svg.h" #include "prefs-utils.h" @@ -128,24 +124,24 @@ sp_svg_transform_read(gchar const *str, NR::Matrix *transform) } else if (n_args != 2) { return false; } - a = NR::translate(args[0], args[1]) * a; + a = Geom::Translate(args[0], args[1]) * a; } else if (!strcmp (keyword, "scale")) { if (n_args == 1) { args[1] = args[0]; } else if (n_args != 2) { return false; } - a = NR::scale(args[0], args[1]) * a; + a = Geom::Scale(args[0], args[1]) * a; } else if (!strcmp (keyword, "rotate")) { if (n_args != 1 && n_args != 3) { return false; } - NR::rotate const rot(rotate_degrees(args[0])); + Geom::Rotate const rot(Geom::deg_to_rad(args[0])); if (n_args == 3) { - a = ( NR::translate(-args[1], -args[2]) + a = ( Geom::Translate(-args[1], -args[2]) * rot - * NR::translate(args[1], args[2]) - * a ); + * Geom::Translate(args[1], args[2]) + * Geom::Matrix(a) ); } else { a = rot * a; } |