diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-04 10:37:17 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-04 20:51:27 +0200 |
| commit | 8c48d69f06ddb3cb6c807a1e7db62dddb9778ded (patch) | |
| tree | 8b6bf137be41ebe93746c4958ab9106bbf5cc339 /include | |
| parent | c05fbde6c870b7e6bc2f9bf642dc7d76215a496f (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')
| -rw-r--r-- | include/basegfx/numeric/ftools.hxx | 4 | ||||
| -rw-r--r-- | include/basegfx/polygon/b2dlinegeometry.hxx | 4 | ||||
| -rw-r--r-- | include/drawinglayer/attribute/lineattribute.hxx | 2 | ||||
| -rw-r--r-- | include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 |
5 files changed, 9 insertions, 9 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 diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 487dbcccf66b..4f01c1f574cb 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -58,7 +58,7 @@ namespace drawinglayer double fWidth = 0.0, basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round, css::drawing::LineCap aLineCap = css::drawing::LineCap_BUTT, - double fMiterMinimumAngle = 15.0 * F_PI180); + double fMiterMinimumAngle = basegfx::deg2rad(15.0)); LineAttribute(); LineAttribute(const LineAttribute&); LineAttribute& operator=(const LineAttribute&); diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index ed0732e48d70..8d1e0b365477 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -73,8 +73,8 @@ namespace drawinglayer double fRadius, basegfx::B2DLineJoin aLineJoin, css::drawing::LineCap aLineCap, - double fDegreeStepWidth = 10.0 * F_PI180, - double fMiterMinimumAngle = 15.0 * F_PI180); + double fDegreeStepWidth = basegfx::deg2rad(10.0), + double fMiterMinimumAngle = basegfx::deg2rad(15.0)); /// data read access double getRadius() const { return mfRadius; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 96fd4246a070..71a73b8e0b0f 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -779,7 +779,7 @@ public: double fLineWidth = 0.0, basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::Round, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT, - double fMiterMinimumAngle = 15.0 * F_PI180); + double fMiterMinimumAngle = basegfx::deg2rad(15.0)); /** Render the given polygon as a line stroke @@ -802,7 +802,7 @@ public: double fTransparency = 0.0, basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::NONE, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT, - double fMiterMinimumAngle = 15.0 * F_PI180, + double fMiterMinimumAngle = basegfx::deg2rad(15.0), bool bBypassAACheck = false); private: |