diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-07 14:45:59 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-07 19:24:17 +0000 |
| commit | 1baad113b2b5210982819f6e43d392d5533ac1ca (patch) | |
| tree | 0c0c7dc4f32c57a337adff01936dfbb8a6112fa8 | |
| parent | 5cef424e1a46ea50da8c0dafabe226dc79b65332 (diff) | |
fdo#65502 - EmfFillPie fix.
Change-Id: Ic52ae70c7879de93029ecfd8b3de85c5fbcfa9eb
Reviewed-on: https://gerrit.libreoffice.org/4189
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 897fa9517964..03481ea9b876 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1298,18 +1298,18 @@ namespace cppcanvas B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2)); B2DSize mappedSize( MapSize (dw/2, dh/2)); - double endAngle = startAngle + sweepAngle; + float endAngle = startAngle + sweepAngle; + startAngle = fmod (startAngle, M_PI*2); + if (startAngle < 0) + startAngle += M_PI*2; + endAngle = fmod (endAngle, M_PI*2); if (endAngle < 0) endAngle += M_PI*2; - endAngle = fmod (endAngle, M_PI*2); - - if (sweepAngle < 0) { - double tmp = startAngle; - startAngle = endAngle; - endAngle = tmp; - } + if (sweepAngle < 0) + std::swap (endAngle, startAngle); - EMFP_DEBUG (printf ("EMF+ angles: %f,%f ---> %f,%f\n", startAngle, sweepAngle, startAngle, endAngle)); + EMFP_DEBUG (printf ("EMF+ adjusted angles to: %f,%f\n", + 360.0*startAngle/M_PI, 360.0*endAngle/M_PI)); B2DPolygon polygon = tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle); polygon.append (mappedCenter); |