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/svg/svg-affine.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/svg')

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;
 			}
-- 
cgit v1.2.3