Rename seg_intersect as line_intersect, to avoid mistaking its semantics

diff --git a/lib/common/geom.c b/lib/common/geom.c
index 5397d9663ece4aaa0a4fac1a0ef3fbb38bd355f6..9f3febb895f7f361820aa4c98eb5c577cc9b2ee9 100644 (file)
--- 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 ca37f3fbdd9ecffc0a28229f7c774e0c690c1c51..988c757b1ae3a86ea5d5fa6b3302673bb9301593 100644 (file)
--- 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 96ac6e20cd6d8dff35a9d0ab0c596f69cca1640a..9cac1a821a21c262dc807faa32d72e188929eee6 100644 (file)
--- 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;
 }