2Geom sync - initial commit

(bzr r14059.2.1)

1 files changed, 0 insertions, 42 deletions

diff --git a/src/2geom/geom.h b/src/2geom/geom.h
index 5aeded23d..6ba812254 100644
--- a/src/2geom/geom.h
+++ b/src/2geom/geom.h
@@ -44,52 +44,10 @@
 
 namespace Geom {
 
-enum IntersectorKind {
-    intersects = 0,
-    parallel,
-    coincident,
-    no_intersection
-};
-
-int
-intersector_ccw(const Geom::Point& p0, const Geom::Point& p1,
-		const Geom::Point& p2);
-
-/* 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,
-		  Geom::Point &result);
-
-IntersectorKind
-segment_intersect(Geom::Point const &p00, Geom::Point const &p01,
-		  Geom::Point const &p10, Geom::Point const &p11,
-		  Geom::Point &result);
-
-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);
 
-boost::optional<Geom::LineSegment>
-rect_line_intersect(Geom::Rect &r,
-                    Geom::Line l);
-
 int centroid(std::vector<Geom::Point> const &p, Geom::Point& centroid, double &area);
 
 }