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

guard against nullptr

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-06-09 00:31:05 +00:00
parent 395345de7d
commit 974c115dff
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1638,26 +1638,29 @@ bool wxMask::Create(const wxBitmap& bitmap)
size_t size = m_bytesPerRow * m_height ; size_t size = m_bytesPerRow * m_height ;
unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ; unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
wxASSERT( destdatabase != NULL ) ; wxASSERT( destdatabase != NULL ) ;
memset( destdatabase , 0 , size ) ; if ( destdatabase )
unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
{ {
unsigned char *destdata = destdatabase ; memset( destdatabase , 0 , size ) ;
unsigned char r, g, b; unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
for ( int x = 0 ; x < m_width ; ++x ) for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
{ {
srcdata++ ; unsigned char *destdata = destdatabase ;
r = *srcdata++ ; unsigned char r, g, b;
g = *srcdata++ ;
b = *srcdata++ ;
if ( ( r + g + b ) > 0x10 ) for ( int x = 0 ; x < m_width ; ++x )
*destdata++ = 0xFF ; {
else srcdata++ ;
*destdata++ = 0x00 ; r = *srcdata++ ;
g = *srcdata++ ;
b = *srcdata++ ;
if ( ( r + g + b ) > 0x10 )
*destdata++ = 0xFF ;
else
*destdata++ = 0x00 ;
}
} }
} }