fix compile.

re-enable decrepated 2geom functions.

diff --git a/src/2geom/geom.h b/src/2geom/geom.h
index 9233696d74fc631d07380c55c56eb18e1a2b2242..dc50c1bb855099379cbe0234497ae9fa00599678 100644 (file)
--- a/src/2geom/geom.h
+++ b/src/2geom/geom.h
@@ -57,7 +57,7 @@ intersector_ccw(const Geom::Point& p0, const Geom::Point& p1,
 
 /* intersectors */
 
-#if 0
+#if 1
 // Use the new routines provided in line.h
 
 IntersectorKind

diff --git a/src/box3d.cpp b/src/box3d.cpp
index 057329a28f4f60937a68881560e0e46ab248ce89..a6dd378f1aa794ed8cc8a460ddefcfcf9683917e 100644 (file)
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -32,7 +32,7 @@
 #include "line-geometry.h"
 #include "persp3d-reference.h"
 #include "uri.h"
-#include "2geom/geom.h"
+#include <2geom/geom.h>
 #include "sp-guide.h"
 #include "sp-namedview.h"
 #include "preferences.h"

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index e181035ebe4f4ed8d56dfa1ca7141410494d4900..a636d8268eed30ddecea77c336e39abd818ba499 100644 (file)
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -710,7 +710,7 @@ CanvasAxonomGridSnapper::_getSnapLines(Geom::Point const &p) const
     // The vertical grid line is at the intersection of two angled grid lines. 
     // Now go find that intersection!
     Geom::Point result;
-    Geom::IntersectorKind is = line_intersection(norm_x, norm_x[Geom::Y]*y_proj_along_x_max,
+    Geom::IntersectorKind is = Geom::line_intersection(norm_x, norm_x[Geom::Y]*y_proj_along_x_max,
                                            norm_z, norm_z[Geom::Y]*y_proj_along_z_max,
                                            result);