diff options
author | Karl Berry <karl@freefriends.org> | 2017-02-13 18:00:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-02-13 18:00:15 +0000 |
commit | bb440dbcfd7ad7284ae37682d3cbc3c24c38d5b7 (patch) | |
tree | b56ff8159511abbf6c15793dc4f86071317a8ac4 /Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp | |
parent | c3c689bb87a59ad757af5f638f99b122e2fa0ff0 (diff) |
dvisvgm-2.1.2 portability patches from author
git-svn-id: svn://tug.org/texlive/trunk@43210 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp index 6e1fcb62940..ecccf636906 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/TpicSpecialHandler.cpp @@ -18,9 +18,7 @@ ** along with this program; if not, see <http://www.gnu.org/licenses/>. ** *************************************************************************/ -#define _USE_MATH_DEFINES #include <config.h> -#include <cmath> #include <cstring> #include <sstream> #include "Color.hpp" @@ -30,7 +28,7 @@ #include "SpecialActions.hpp" #include "SVGTree.hpp" #include "TpicSpecialHandler.hpp" - +#include "utility.hpp" using namespace std; @@ -182,19 +180,18 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions &actions) { * @param[in] angle2 ending angle (clockwise) relative to x-axis * @param[in] actions object providing the actions that can be performed by the SpecialHandler */ void TpicSpecialHandler::drawArc (double cx, double cy, double rx, double ry, double angle1, double angle2, SpecialActions &actions) { - const double PI2 = 2*M_PI; angle1 *= -1; angle2 *= -1; - if (fabs(angle1) > PI2) { - int n = (int)(angle1/PI2); - angle1 = angle1 - n*PI2; - angle2 = angle2 - n*PI2; + if (fabs(angle1) > math::TWO_PI) { + int n = (int)(angle1/math::TWO_PI); + angle1 = angle1 - n*math::TWO_PI; + angle2 = angle2 - n*math::TWO_PI; } double x = cx + actions.getX(); double y = cy + actions.getY(); XMLElementNode *elem=0; - if (fabs(angle1-angle2) >= PI2) { // closed ellipse? + if (fabs(angle1-angle2) >= math::TWO_PI) { // closed ellipse? elem = new XMLElementNode("ellipse"); elem->addAttribute("cx", XMLString(x)); elem->addAttribute("cy", XMLString(y)); @@ -203,11 +200,11 @@ void TpicSpecialHandler::drawArc (double cx, double cy, double rx, double ry, do } else { if (angle1 < 0) - angle1 = PI2+angle1; + angle1 = math::TWO_PI+angle1; if (angle2 < 0) - angle2 = PI2+angle2; + angle2 = math::TWO_PI+angle2; elem = new XMLElementNode("path"); - int large_arg = fabs(angle1-angle2) > M_PI ? 0 : 1; + int large_arg = fabs(angle1-angle2) > math::PI ? 0 : 1; int sweep_flag = angle1 > angle2 ? 0 : 1; if (angle1 > angle2) { large_arg = 1-large_arg; |