X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fclip.cpp;h=ebf94c2ee02c7f3485fc8ea0a841219af70f2b07;hp=4aa6f019a50291392e874af8efce63aff1e1fba6;hb=2d39e823ba389fc68e5317c422b55be006094252;hpb=99dd1d6ed10db1f669a5fe6af71225a50fc0ddfb diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp index 4aa6f01..ebf94c2 100644 --- a/libctsupport/clip.cpp +++ b/libctsupport/clip.cpp @@ -14,7 +14,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: clip.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $ +** $Id: clip.cpp,v 1.3 2000/06/22 10:17:28 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -30,8 +30,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#include "kstddef.h" -#include "kmath.h" +#include "ctsupport.h" /* NAME @@ -152,8 +151,8 @@ clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, co xform_mtx2 (rotmtx, ccx, ccy); t1 += theta; // rotate start and stop angles t2 += theta; - t1 = norm_ang (t1); - t2 = norm_ang (t2); + t1 = normalizeAngle (t1); + t2 = normalizeAngle (t2); if (xc2 < -D_EPSILON || fabs(yc2) > F_EPSILON) { sys_error (ERR_SEVERE, "Internal error in clip_circle\n x1=%6.2f, y1=%6.2f, x2=%6.2f, y2=%6.2f, xc2=%6.2f, yc2=%6.2f, theta=%6.2f", x1, y1, x2, y2, xc2, yc2, theta);