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

Avoid some -Wfloat-conversion warnings

Browse Source
This commit is contained in:
Paul Cornett
2022-02-13 18:11:55 -08:00
parent 511c537362
commit 3aad506c5b
24 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/core/bitmap.cpp
View File

@@ -309,7 +309,7 @@ int wxBitmapRefData::GetWidth() const
if ( m_hBitmap )
return (int) CGBitmapContextGetWidth(m_hBitmap);
else
return (int) wxOSXGetImageSize(m_nsImage).width * m_scaleFactor;
return int(wxOSXGetImageSize(m_nsImage).width * m_scaleFactor);
}
int wxBitmapRefData::GetHeight() const
@@ -319,7 +319,7 @@ int wxBitmapRefData::GetHeight() const
if ( m_hBitmap )
return (int) CGBitmapContextGetHeight(m_hBitmap);
else
return (int) wxOSXGetImageSize(m_nsImage).height * m_scaleFactor;
return int(wxOSXGetImageSize(m_nsImage).height * m_scaleFactor);
}
int wxBitmapRefData::GetDepth() const
@@ -966,8 +966,8 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
if ( HasAlpha() )
ret.UseAlpha() ;
int destwidth = rect.width*scale ;
int destheight = rect.height*scale ;
int destwidth = int(rect.width * scale);
int destheight = int(rect.height * scale);
{
const unsigned char* sourcedata = static_cast<const unsigned char*>(GetBitmapData()->GetRawAccess());