Warning cleanup.

[inkscape.git] / src / desktop-affine.cpp

diff --git a/src/desktop-affine.cpp b/src/desktop-affine.cpp
index 7ad2c7bfeaf39b063965dda3516887409ddedd56..707b1df8a49e45351e4a7c02d5fb48a4cfde6bab 100644 (file)
--- a/src/desktop-affine.cpp
+++ b/src/desktop-affine.cpp
@@ -13,28 +13,39 @@
  */
 
 #include "desktop.h"
-#include "document.h"
-#include "sp-root.h"
-#include "libnr/nr-matrix-ops.h"
+//#include "document.h"
+//#include "sp-root.h"
 
-NR::Matrix const sp_desktop_root2dt_affine (SPDesktop const *dt)
+Geom::Matrix const sp_desktop_dt2doc_affine (SPDesktop const *dt)
 {
-       SPRoot const *root = SP_ROOT(SP_DOCUMENT_ROOT(dt->doc()));
-       return root->c2p * dt->doc2dt();
+    return dt->doc2dt().inverse();
 }
 
-NR::Matrix const sp_desktop_dt2root_affine (SPDesktop const *dt)
+Geom::Point sp_desktop_dt2doc_xy_point(SPDesktop const *dt, Geom::Point const p)
 {
-       return sp_desktop_root2dt_affine(dt).inverse();
+    return p * sp_desktop_dt2doc_affine(dt);
 }
 
-NR::Point sp_desktop_root2dt_xy_point(SPDesktop const *dt, NR::Point const p)
+#if 0
+Geom::Matrix const sp_desktop_root2dt_affine (SPDesktop const *dt)
 {
-       return p * sp_desktop_root2dt_affine(dt);
+    SPRoot const *root = SP_ROOT(SP_DOCUMENT_ROOT(dt->doc()));
+    return root->c2p * dt->doc2dt();
 }
 
-NR::Point sp_desktop_dt2root_xy_point(SPDesktop const *dt, NR::Point const p)
+Geom::Matrix const sp_desktop_dt2root_affine (SPDesktop const *dt)
 {
-       return p * sp_desktop_dt2root_affine(dt);
+    return sp_desktop_root2dt_affine(dt).inverse();
 }
 
+Geom::Point sp_desktop_root2dt_xy_point(SPDesktop const *dt, Geom::Point const p)
+{
+    return p * sp_desktop_root2dt_affine(dt);
+}
+
+Geom::Point sp_desktop_dt2root_xy_point(SPDesktop const *dt, Geom::Point const p)
+{
+    return p * sp_desktop_dt2root_affine(dt);
+}
+#endif
+