Remove geom.cpp and geom.h. Now use 2geom/geom.cpp and 2geom.h.

Add conversion functions between Geom::Point and NR::Point

(bzr r4050)

1 files changed, 11 insertions, 0 deletions

diff --git a/src/libnr/nr-point.h b/src/libnr/nr-point.h
index f67a66800..60c5586b0 100644
--- a/src/libnr/nr-point.h
+++ b/src/libnr/nr-point.h
@@ -16,6 +16,8 @@
 //#include "round.h"
 #include "decimal-round.h"
 
+#include <2geom/point.h>
+
 /// A NRPoint consists of x and y coodinates.
 /// \todo
 /// This class appears to be obsoleted out in favour of NR::Point.
@@ -49,6 +51,11 @@ public:
         }
     }
 
+    inline Point(Geom::Point const &p) {
+        _pt[X] = p[Geom::X];
+        _pt[Y] = p[Geom::Y];
+    }
+
     inline Point &operator=(Point const &p) {
         for (unsigned i = 0; i < 2; ++i) {
             _pt[i] = p._pt[i];
@@ -132,6 +139,10 @@ public:
 
     friend inline std::ostream &operator<< (std::ostream &out_file, const NR::Point &in_pnt);
 
+    inline Geom::Point to_2geom() const {
+        return Geom::Point(_pt[X], _pt[Y]);
+    }
+
 private:
     Coord _pt[2];
 };