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

Merge branch 'warnings' of https://github.com/catalinr/wxWidgets

Browse Source 
Fix MSVS analyzer warnings about int multiplication overflow and
uninitialized member variables.

See https://github.com/wxWidgets/wxWidgets/pull/1606
This commit is contained in:
Vadim Zeitlin
2019-10-15 22:50:17 +02:00
parent cfdcc3c29d 67dd28619f
commit ad7fb7f4aa
11 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/geometry.h
View File

@@ -133,7 +133,7 @@ inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) const
inline wxDouble wxPoint2DInt::GetVectorLength() const
{
// 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 )
@@ -155,7 +155,8 @@ inline wxDouble wxPoint2DInt::GetDistance( 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)*((wxDouble)pt.m_x-m_x) +
((wxDouble)pt.m_y-m_y)*((wxDouble)pt.m_y-m_y) );
}
inline wxInt32 wxPoint2DInt::GetDotProduct( const wxPoint2DInt &vec ) const