summaryrefslogtreecommitdiff
path: root/include/basegfx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-08-04 10:37:17 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-08-04 20:51:27 +0200
commit8c48d69f06ddb3cb6c807a1e7db62dddb9778ded (patch)
tree8b6bf137be41ebe93746c4958ab9106bbf5cc339 /include/basegfx
parentc05fbde6c870b7e6bc2f9bf642dc7d76215a496f (diff)
Use more basegfx deg<->rad functions, instead of direct formulas
Also make the functions constexpr. Due to slight changes in floating-point arithmetics (90.0 instead of 180.0, M_PI2 instead of M_PI resp.), results might differ in last digits (usually 17th decimal digit). This has lead to need to tweak char2dump's PieChartTest unit test. Change-Id: I20323dd7dab27e4deb408ea4181e390cc05e7cd3 Reviewed-on: https://gerrit.libreoffice.org/58583 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/basegfx')
-rw-r--r--include/basegfx/numeric/ftools.hxx4
-rw-r--r--include/basegfx/polygon/b2dlinegeometry.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 1ade3bb3a3d6..da453a1a1b3d 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -125,7 +125,7 @@ namespace basegfx
/** Convert value from degrees to radians
*/
- inline double deg2rad( double v )
+ constexpr double deg2rad( double v )
{
// divide first, to get exact values for v being a multiple of
// 90 degrees
@@ -134,7 +134,7 @@ namespace basegfx
/** Convert value radians to degrees
*/
- inline double rad2deg( double v )
+ constexpr double rad2deg( double v )
{
// divide first, to get exact values for v being a multiple of
// pi/2
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index 441e65ffc079..29be9934ede0 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -134,9 +134,9 @@ namespace basegfx
double fHalfLineWidth,
B2DLineJoin eJoin,
css::drawing::LineCap eCap,
- double fMaxAllowedAngle = (12.5 * F_PI180),
+ double fMaxAllowedAngle = basegfx::deg2rad(12.5),
double fMaxPartOfEdge = 0.4,
- double fMiterMinimumAngle = (15.0 * F_PI180));
+ double fMiterMinimumAngle = basegfx::deg2rad(15.0));
} // end of namespace utils
} // end of namespace basegfx