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

avoid shadowed variable warnings with VS2015

Browse Source
This commit is contained in:
Paul Cornett
2015-07-24 20:56:11 -07:00
parent 64308117e8
commit 36e31e515e
18 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/graphics.cpp
View File

@@ -1761,11 +1761,11 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
interim.GetPixelFormat(),&data);
bool hasAlpha = false;
for ( size_t y = 0 ; y < height && !hasAlpha ; ++y)
for ( size_t yy = 0 ; yy < height && !hasAlpha ; ++yy)
{
for( size_t x = 0 ; x < width && !hasAlpha; ++x)
for( size_t xx = 0 ; xx < width && !hasAlpha; ++xx)
{
ARGB *dest = (ARGB*)((BYTE*)data.Scan0 + data.Stride*y + x*4);
ARGB *dest = (ARGB*)((BYTE*)data.Scan0 + data.Stride*yy + xx*4);
if ( ( *dest & Color::AlphaMask ) != 0 )
hasAlpha = true;
}