X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85b88942cca1395ce7c827233e64aaa5eef838d2..82a16d7e5e5c83e95a4caa7314de2dbfbd1debdc:/src/common/dcsvg.cpp

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index baf6095050..8dcf308a59 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -229,13 +229,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
 
     // wxT("upper left") and wxT("upper right")
     CalcBoundingBox(x, y);
-    CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+    CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
 
     // wxT("bottom left") and wxT("bottom right")
     x += (wxCoord)(h*sin(rad));
     y += (wxCoord)(h*cos(rad));
     CalcBoundingBox(x, y);
-    CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+    CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
 
     if (m_backgroundMode == wxSOLID)
     {
@@ -373,14 +373,14 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
         write(s);
     }
 
-    double theta1 = atan2(yc-y1,x1-xc);
+    double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
     if ( theta1 < 0 ) theta1 = theta1 + 3.14 * 2;
-    double theta2 = atan2(yc-y2, x2-xc);
+    double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
     if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2;
     if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ;
 
     int fArc  ;                  // flag for large or small arc 0 means less than 180 degrees
-    if (  fabs((theta2 - theta1) > 3.14 )) fArc = 1; else fArc = 0 ;
+    if ( fabs(theta2 - theta1) > 3.14 ) fArc = 1; else fArc = 0 ;
 
     int fSweep = 0 ;             // flag for sweep always 0
 
@@ -446,7 +446,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
     if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
 
     int fSweep ;
-    if ( fabs( (theta2 - theta1) > 3.14)) fSweep = 1; else fSweep = 0 ;
+    if ( fabs(theta2 - theta1) > 3.14) fSweep = 1; else fSweep = 0 ;
 
     s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d  %d %d L %d %d z "),
         int(xs), int(ys), int(rx), int(ry),
@@ -840,7 +840,7 @@ wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
 
 void wxSVGFileDC::write(const wxString &s)
 {
-	wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
+	const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
 	m_outfile->Write(buf, strlen((const char *)buf));
 	m_OK = m_outfile->Ok();
 }