[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source

[Michael Stahl]

 cppcanvas/source/mtfrenderer/emfplus.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3e694124efbc136058d78038d8be00cd92281662
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 7 20:54:33 2013 +0200

    cppcanvas: try to make MSVC tinderbox happy
    
    (cherry picked from commit 930127da85ee72ccec6b81efc18cc9878f11d88d)
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
    
    Conflicts:
    	cppcanvas/source/mtfrenderer/emfplus.cxx
    
    Change-Id: If4fd5a788d3907a986e27f5f53d5995c7035f685

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 03481ea..6ca731a 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1299,12 +1299,12 @@ namespace cppcanvas
                         B2DSize mappedSize( MapSize (dw/2, dh/2));
 
                         float endAngle = startAngle + sweepAngle;
-                        startAngle = fmod (startAngle, M_PI*2);
+                        startAngle = fmodf(startAngle, M_PI*2);
                         if (startAngle < 0)
-                            startAngle += M_PI*2;
-                        endAngle = fmod (endAngle, M_PI*2);
+                            startAngle += static_cast<float>(M_PI*2);
+                        endAngle = fmodf(endAngle, M_PI*2);
                         if (endAngle < 0)
-                            endAngle += M_PI*2;
+                            endAngle += static_cast<float>(M_PI*2);
                         if (sweepAngle < 0)
                             std::swap (endAngle, startAngle);