From a6e9c9b3ed5d7dc3ff04e1375f80b100243561c6 Mon Sep 17 00:00:00 2001
From: erg <devnull@localhost>
Date: Tue, 30 Sep 2008 18:52:12 +0000
Subject: [PATCH] Rename seg_intersect as line_intersect, to avoid mistaking
 its semantics

---
 lib/common/geom.c          | 4 ++--
 lib/common/geomprocs.h     | 2 +-
 lib/neatogen/multispline.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/common/geom.c b/lib/common/geom.c
index 5397d9663..9f3febb89 100644
--- a/lib/common/geom.c
+++ b/lib/common/geom.c
@@ -390,12 +390,12 @@ double ptToLine2 (pointf a, pointf b, pointf p)
 
 #define dot(v,w) (v.x*w.x+v.y*w.y)
 
-/* intersect:
+/* line_intersect:
  * Computes intersection of lines a-b and c-d, returning intersection
  * point in *p.
  * Returns 0 if no intersection (lines parallel), 1 otherwise.
  */
-int seg_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p)
+int line_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p)
 {
     pointf mv = sub_pointf(b,a);
     pointf lv = sub_pointf(d,c);
diff --git a/lib/common/geomprocs.h b/lib/common/geomprocs.h
index ca37f3fbd..988c757b1 100644
--- a/lib/common/geomprocs.h
+++ b/lib/common/geomprocs.h
@@ -44,7 +44,7 @@ extern pointf cwrotatepf(pointf p, int cwrot);
 
 extern void rect2poly(pointf *p);
 
-extern int seg_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p);
+extern int line_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p);
 
 static inline point pointof(int x, int y)
 {
diff --git a/lib/neatogen/multispline.c b/lib/neatogen/multispline.c
index 96ac6e20c..9cac1a821 100644
--- a/lib/neatogen/multispline.c
+++ b/lib/neatogen/multispline.c
@@ -276,7 +276,7 @@ static int
 raySegIntersect(pointf v, pointf w, pointf a, pointf b, pointf * p)
 {
     if (raySeg(v, w, a, b))
-	return seg_intersect(v, w, a, b, p);
+	return line_intersect(v, w, a, b, p);
     else
 	return 0;
 }
-- 
2.40.0