diff --git a/src/proj_pt.h b/src/proj_pt.h
index b14dea50e3b73fcfeab0b0168ee29abaa7508bd1..844cbb2c42732fd9e86f6d7e454728764c0ced11 100644 (file)
--- a/src/proj_pt.h
+++ b/src/proj_pt.h
*/
#include <2geom/point.h>
-#include "libnr/nr-point.h"
#include "libnr/nr-values.h"
#include <gtk/gtk.h>
public:
Pt2 () { pt[0] = 0; pt[1] = 0; pt[2] = 1.0; } // we default to (0 : 0 : 1)
Pt2 (double x, double y, double w) { pt[0] = x; pt[1] = y; pt[2] = w; }
- Pt2 (NR::Point const &point) { pt[0] = point[NR::X]; pt[1] = point[NR::Y]; pt[2] = 1; }
Pt2 (Geom::Point const &point) { pt[0] = point[Geom::X]; pt[1] = point[Geom::Y]; pt[2] = 1; }
Pt2 (const gchar *coord_str);
}
void normalize();
- NR::Point affine();
+ Geom::Point affine();
inline bool is_finite() { return pt[2] != 0; } // FIXME: Should we allow for some tolerance?
gchar *coord_string();
inline void print(gchar const *s) const { g_print ("%s(%8.2f : %8.2f : %8.2f)\n", s, pt[0], pt[1], pt[2]); }