summaryrefslogtreecommitdiff
path: root/xfa/fxgraphics
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-03 14:51:45 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-03 20:36:56 +0000
commit669a418f75c05d4a39e2bcaff2b7b93dec1c5764 (patch)
treeb76f5025c8e70b1ef449f317ff60a8eef7317ab9 /xfa/fxgraphics
parentac978f83392e309488601eb382d5f318b6d366ad (diff)
downloadpdfium-669a418f75c05d4a39e2bcaff2b7b93dec1c5764.tar.xz
Drop FXSYS_ from math methods
This Cl drops the FXSYS_ from math methods which are the same on all platforms. Bug: pdfium:694 Change-Id: I85c9ff841fd9095b1434f67319847ba0cd9df7ac Reviewed-on: https://pdfium-review.googlesource.com/3598 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxgraphics')
-rw-r--r--xfa/fxgraphics/cfx_graphics.cpp2
-rw-r--r--xfa/fxgraphics/cfx_path.cpp16
2 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index 3cfe2d0192..1f224c7685 100644
--- a/xfa/fxgraphics/cfx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -452,7 +452,7 @@ void CFX_Graphics::FillPathWithShading(CFX_Path* path,
if (b2_4ac < 0) {
continue;
}
- float root = (FXSYS_sqrt(b2_4ac));
+ float root = (sqrt(b2_4ac));
float s1, s2;
if (a > 0) {
s1 = (-b - root) / (2 * a);
diff --git a/xfa/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp
index 5ff9bffb07..fc0051ad4c 100644
--- a/xfa/fxgraphics/cfx_path.cpp
+++ b/xfa/fxgraphics/cfx_path.cpp
@@ -50,14 +50,14 @@ void CFX_Path::ArcToInternal(const CFX_PointF& pos,
const CFX_SizeF& size,
float start_angle,
float sweep_angle) {
- float x0 = FXSYS_cos(sweep_angle / 2);
- float y0 = FXSYS_sin(sweep_angle / 2);
+ float x0 = cos(sweep_angle / 2);
+ float y0 = sin(sweep_angle / 2);
float tx = ((1.0f - x0) * 4) / (3 * 1.0f);
float ty = y0 - ((tx * x0) / y0);
CFX_PointF points[] = {CFX_PointF(x0 + tx, -ty), CFX_PointF(x0 + tx, ty)};
- float sn = FXSYS_sin(start_angle + sweep_angle / 2);
- float cs = FXSYS_cos(start_angle + sweep_angle / 2);
+ float sn = sin(start_angle + sweep_angle / 2);
+ float cs = cos(start_angle + sweep_angle / 2);
CFX_PointF bezier;
bezier.x = pos.x + (size.width * ((points[0].x * cs) - (points[0].y * sn)));
@@ -68,8 +68,8 @@ void CFX_Path::ArcToInternal(const CFX_PointF& pos,
bezier.y = pos.y + (size.height * ((points[1].x * sn) + (points[1].y * cs)));
data_.AppendPoint(bezier, FXPT_TYPE::BezierTo, false);
- bezier.x = pos.x + (size.width * FXSYS_cos(start_angle + sweep_angle));
- bezier.y = pos.y + (size.height * FXSYS_sin(start_angle + sweep_angle));
+ bezier.x = pos.x + (size.width * cos(start_angle + sweep_angle));
+ bezier.y = pos.y + (size.height * sin(start_angle + sweep_angle));
data_.AppendPoint(bezier, FXPT_TYPE::BezierTo, false);
}
@@ -105,8 +105,8 @@ void CFX_Path::AddArc(const CFX_PointF& original_pos,
CFX_SizeF size = original_size / 2;
CFX_PointF pos(original_pos.x + size.width, original_pos.y + size.height);
- data_.AppendPoint(pos + CFX_PointF(size.width * FXSYS_cos(start_angle),
- size.height * FXSYS_sin(start_angle)),
+ data_.AppendPoint(pos + CFX_PointF(size.width * cos(start_angle),
+ size.height * sin(start_angle)),
FXPT_TYPE::MoveTo, false);
float total_sweep = 0;