Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cast int to double to avoid arithmetic overflow warning

Browse Source
This commit is contained in:
catalinr
2019-10-14 07:49:28 +03:00
parent 05e0fad687
commit c150ece20f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/geometry.h
View File

@@ -133,7 +133,7 @@ inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) const
inline wxDouble wxPoint2DInt::GetVectorLength() const inline wxDouble wxPoint2DInt::GetVectorLength() const
{ {
// cast needed MIPSpro compiler under SGI // cast needed MIPSpro compiler under SGI
return sqrt( (double)(m_x)*(m_x) + (m_y)*(m_y) ); return sqrt( (wxDouble)(m_x)*(m_x) + (wxDouble)(m_y)*(m_y) );
} }
inline void wxPoint2DInt::SetVectorLength( wxDouble length ) inline void wxPoint2DInt::SetVectorLength( wxDouble length )
@@ -155,7 +155,7 @@ inline wxDouble wxPoint2DInt::GetDistance( const wxPoint2DInt &pt ) const
inline wxDouble wxPoint2DInt::GetDistanceSquare( const wxPoint2DInt &pt ) const inline wxDouble wxPoint2DInt::GetDistanceSquare( const wxPoint2DInt &pt ) const
{ {
return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) ); return ( (wxDouble)(pt.m_x-m_x)*(pt.m_x-m_x) + (wxDouble)(pt.m_y-m_y)*(pt.m_y-m_y) );
} }
inline wxInt32 wxPoint2DInt::GetDotProduct( const wxPoint2DInt &vec ) const inline wxInt32 wxPoint2DInt::GetDotProduct( const wxPoint2DInt &vec ) const

2
include/wx/math.h
View File

@@ -136,7 +136,7 @@ inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
inline int wxRound(double x) inline int wxRound(double x)
{ {
wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, wxASSERT_MSG( x > (double)INT_MIN - 0.5 && x < (double)INT_MAX + 0.5,
wxT("argument out of supported range") ); wxT("argument out of supported range") );
#if defined(HAVE_ROUND) #if defined(HAVE_ROUND)