update to 2geom rev.1723

(bzr r6996)

1 files changed, 16 insertions, 5 deletions

diff --git a/src/2geom/geom.h b/src/2geom/geom.h
index d0af7d7d2..9233696d7 100644
--- a/src/2geom/geom.h
+++ b/src/2geom/geom.h
@@ -37,8 +37,10 @@
 //TODO: move somewhere else
 
 #include <vector>
-#include <2geom/point.h>
-#include <2geom/rect.h>
+#include <2geom/forward.h>
+#include <boost/optional/optional.hpp>
+#include <2geom/bezier-curve.h>
+#include <2geom/line.h>
 
 namespace Geom {
 
@@ -55,6 +57,9 @@ intersector_ccw(const Geom::Point& p0, const Geom::Point& p1,
 
 /* intersectors */
 
+#if 0
+// Use the new routines provided in line.h
+
 IntersectorKind
 line_intersection(Geom::Point const &n0, double const d0,
 		  Geom::Point const &n1, double const d1,
@@ -69,17 +74,23 @@ IntersectorKind
 line_twopoint_intersect(Geom::Point const &p00, Geom::Point const &p01,
 			Geom::Point const &p10, Geom::Point const &p11,
 			Geom::Point &result);
+#endif
 
+#if 0
 std::vector<Geom::Point>
 rect_line_intersect(Geom::Point const &E, Geom::Point const &F,
                     Geom::Point const &p0, Geom::Point const &p1);
+#endif
 
+boost::optional<Geom::LineSegment>
+rect_line_intersect(Geom::Rect &r,
+                    Geom::LineSegment ls);
 
-std::vector<Geom::Point>
+boost::optional<Geom::LineSegment>
 rect_line_intersect(Geom::Rect &r,
-                    Geom::Point const &p0, Geom::Point const &p1);
+                    Geom::Line l);
 
-int centroid(std::vector<Geom::Point> p, Geom::Point& centroid, double &area);
+int centroid(std::vector<Geom::Point> const &p, Geom::Point& centroid, double &area);
 
 }