From b9e3ff54c1bea04b980ec517347b33fe2e706f4e Mon Sep 17 00:00:00 2001 From: erg Date: Thu, 20 Mar 2008 16:14:50 +0000 Subject: [PATCH] Rename intersect() in geom.c as seg_intersect() to avoid conflict with pathplan. --- cmd/smyrna/selection.c | 2 +- lib/common/geom.c | 2 +- lib/common/geomprocs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/smyrna/selection.c b/cmd/smyrna/selection.c index 90736127e..c075122a1 100755 --- a/cmd/smyrna/selection.c +++ b/cmd/smyrna/selection.c @@ -1024,7 +1024,7 @@ static int line_intersects(float *x, float *y, float *X, float *Y) pD.x = x[3]; pD.y = y[3]; - if (intersect(pA, pB, pC, pD, &pX)) { + if (seg_intersect(pA, pB, pC, pD, &pX)) { *X = (float) pX.x; *Y = (float) pX.y; if ((pX.x >= x[2] - 0.01) && (pX.x < x[3] + 0.01) && diff --git a/lib/common/geom.c b/lib/common/geom.c index 33bd07a25..f0106386f 100644 --- a/lib/common/geom.c +++ b/lib/common/geom.c @@ -576,7 +576,7 @@ scale (double c, pointf a) * Returns 0 if no intersection (lines parallel), 1 otherwise. */ int -intersect (pointf a, pointf b, pointf c, pointf d, pointf* x) +seg_intersect (pointf a, pointf b, pointf c, pointf d, pointf* x) { pointf mv = subPt (b,a); pointf lv = subPt (d,c); diff --git a/lib/common/geomprocs.h b/lib/common/geomprocs.h index 18d610df1..617f780e9 100644 --- a/lib/common/geomprocs.h +++ b/lib/common/geomprocs.h @@ -73,7 +73,7 @@ extern pointf cwrotatepf(pointf p, int cwrot); extern void rect2poly(pointf *p); -extern int intersect (pointf a, pointf b, pointf c, pointf d, pointf* x); +extern int seg_intersect (pointf a, pointf b, pointf c, pointf d, pointf* x); #ifdef __cplusplus } #endif -- 2.40.0