From fb88ba480b4193da5bc91e3ba6738aa2c548280e Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Tue, 23 Nov 2004 14:54:38 +0000
Subject: [PATCH] SF patch 1067466
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
contrib/src/svg/dcsvg.cpp | 8 ++++----
src/common/dcsvg.cpp | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/contrib/src/svg/dcsvg.cpp b/contrib/src/svg/dcsvg.cpp
index 3369f14b01..8dcf308a59 100644
--- a/contrib/src/svg/dcsvg.cpp
+++ b/contrib/src/svg/dcsvg.cpp
@@ -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),
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 3369f14b01..8dcf308a59 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -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),
--
2.47.2