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

supporting a null cgimage so that we don't get exceptions, only an wxbitmap that is !Ok()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-25 18:47:12 +00:00
parent 5769f801b4
commit 554b2800c6
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,35 +291,38 @@ wxBitmapRefData::wxBitmapRefData(CGImageRef image)
bool wxBitmapRefData::Create(CGImageRef image) bool wxBitmapRefData::Create(CGImageRef image)
{ {
m_width = CGImageGetWidth(image); if ( image != NULL )
m_height = CGImageGetHeight(image);
m_depth = 32;
m_hBitmap = NULL;
m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
size_t size = m_bytesPerRow * m_height ;
void* data = m_memBuf.GetWriteBuf( size ) ;
if ( data != NULL )
{ {
memset( data , 0 , size ) ; m_width = CGImageGetWidth(image);
m_memBuf.UngetWriteBuf( size ) ; m_height = CGImageGetHeight(image);
CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image); m_depth = 32;
if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipLast || alpha == kCGImageAlphaNoneSkipLast ) m_hBitmap = NULL;
{
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
}
else
{
m_hasAlpha = true;
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst );
}
CGRect rect = {{0,0},{m_width,m_height}};
CGContextDrawImage(m_hBitmap, rect, image);
wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ; m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
CGContextTranslateCTM( m_hBitmap, 0, m_height ); size_t size = m_bytesPerRow * m_height ;
CGContextScaleCTM( m_hBitmap, 1, -1 ); void* data = m_memBuf.GetWriteBuf( size ) ;
} /* data != NULL */ if ( data != NULL )
{
memset( data , 0 , size ) ;
m_memBuf.UngetWriteBuf( size ) ;
CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image);
if ( alpha == kCGImageAlphaNone || alpha == kCGImageAlphaNoneSkipLast || alpha == kCGImageAlphaNoneSkipLast )
{
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
}
else
{
m_hasAlpha = true;
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst );
}
CGRect rect = {{0,0},{m_width,m_height}};
CGContextDrawImage(m_hBitmap, rect, image);
wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
CGContextTranslateCTM( m_hBitmap, 0, m_height );
CGContextScaleCTM( m_hBitmap, 1, -1 );
} /* data != NULL */
}
m_ok = ( m_hBitmap != NULL ) ; m_ok = ( m_hBitmap != NULL ) ;
return m_ok ; return m_ok ;