From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Jul 2024 10:19:30 +0200 Subject: New upstream version 5.3.0GA --- app/bin/utility.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/bin/utility.h') diff --git a/app/bin/utility.h b/app/bin/utility.h index 3686ae8..8e8cf17 100644 --- a/app/bin/utility.h +++ b/app/bin/utility.h @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef UTILITY_H @@ -56,10 +56,13 @@ void Translate( coOrd *res, coOrd orig, double a, double d ); double FindAngle( coOrd p0, coOrd p1 ); int PointOnCircle( coOrd * resP, coOrd center, double radius, double angle ); double ConstrainR( double r ); -void FindPos( coOrd * res, double * beyond, coOrd pos, coOrd orig, double angle, double length ); +void FindPos( coOrd * res, double * beyond, coOrd pos, coOrd orig, double angle, + double length ); int FindIntersection( coOrd *Pc, coOrd P00, double A0, coOrd P10, double A1 ); -BOOL_T FindArcAndLineIntersections (coOrd *Pc1, coOrd *Pc2, coOrd c, DIST_T r, coOrd p0, coOrd p1); -BOOL_T FindArcIntersections ( coOrd *Pc, coOrd *Pc2, coOrd center1, DIST_T radius1, coOrd center2, DIST_T radius2); +BOOL_T FindArcAndLineIntersections (coOrd *Pc1, coOrd *Pc2, coOrd c, DIST_T r, + coOrd p0, coOrd p1); +BOOL_T FindArcIntersections ( coOrd *Pc, coOrd *Pc2, coOrd center1, + DIST_T radius1, coOrd center2, DIST_T radius2); double LineDistance( coOrd *p, coOrd p0, coOrd p1 ); double CircleDistance( coOrd *p, coOrd c, double r, double a0, double a1 ); int PickArcEndPt( coOrd, coOrd, coOrd ); -- cgit v1.2.3