diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-07 15:00:17 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-07 15:04:21 +0100 |
| commit | 768b77ef49d03864c4eca084d805169e01e67b22 (patch) | |
| tree | 68e88272f6fe64a112b4347306171ca328b3e859 /cppcanvas | |
| parent | 8ce82f83fb8146b684bec5d903d76f034ba37d4a (diff) | |
fdo#65502 - EmfFillPie fix.
Change-Id: I395ef5f5175b9a2d758f4023605b8e2d4dce859f
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 4cfd7b998e69..285b824d319f 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1342,18 +1342,19 @@ 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); - SAL_INFO("cppcanvas.emf", "EMF+ angles: " << startAngle << "," << sweepAngle << " ---> " << startAngle << "," << endAngle); + SAL_INFO("cppcanvas.emf", "EMF+ adjusted angles: start " << + (360.0*startAngle/M_PI) << ", end: " << (360.0*endAngle/M_PI)); B2DPolygon polygon = tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle); polygon.append (mappedCenter); |