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

applying patch 1873285

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-02-27 08:11:33 +00:00
parent 58d0deaac1
commit 0d0b1695e0
1 changed files with 105 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
src/mac/carbon/bitmap.cpp
View File

@@ -272,19 +272,21 @@ bool wxBitmapRefData::Create( int w , int h , int d )
m_width = wxMax(1, w); m_width = wxMax(1, w);
m_height = wxMax(1, h); m_height = wxMax(1, h);
m_depth = d ; m_depth = d ;
m_hBitmap = NULL ;
m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ; m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ;
size_t size = m_bytesPerRow * h ; size_t size = m_bytesPerRow * h ;
void* data = m_memBuf.GetWriteBuf( size ) ; void* data = m_memBuf.GetWriteBuf( size ) ;
memset( data , 0 , size ) ; if ( data != NULL )
m_memBuf.UngetWriteBuf( size ) ; {
memset( data , 0 , size ) ;
m_hBitmap = NULL ; m_memBuf.UngetWriteBuf( size ) ;
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
CGContextTranslateCTM( m_hBitmap, 0, m_height );
CGContextScaleCTM( m_hBitmap, 1, -1 );
m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
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 ;
@@ -881,51 +883,56 @@ wxBitmap::~wxBitmap()
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
{ {
m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ; wxBitmapRefData* bitmapRefData;
if ( no_bits == 1 ) m_refData = bitmapRefData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
if (bitmapRefData->IsOk())
{ {
int linesize = ( the_width / (sizeof(unsigned char) * 8)) ; if ( no_bits == 1 )
if ( the_width % (sizeof(unsigned char) * 8) )
linesize += sizeof(unsigned char);
unsigned char* linestart = (unsigned char*) bits ;
unsigned char* destptr = (unsigned char*) BeginRawAccess() ;
for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )
{ {
unsigned char* destination = destptr; int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
int index, bit, mask; if ( the_width % (sizeof(unsigned char) * 8) )
linesize += sizeof(unsigned char);
for ( int x = 0 ; x < the_width ; ++x ) unsigned char* linestart = (unsigned char*) bits ;
unsigned char* destptr = (unsigned char*) BeginRawAccess() ;
for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )
{ {
index = x / 8 ; unsigned char* destination = destptr;
bit = x % 8 ; int index, bit, mask;
mask = 1 << bit ;
if ( linestart[index] & mask ) for ( int x = 0 ; x < the_width ; ++x )
{ {
*destination++ = 0xFF ; index = x / 8 ;
*destination++ = 0 ; bit = x % 8 ;
*destination++ = 0 ; mask = 1 << bit ;
*destination++ = 0 ;
} if ( linestart[index] & mask )
else {
{ *destination++ = 0xFF ;
*destination++ = 0xFF ; *destination++ = 0 ;
*destination++ = 0xFF ; *destination++ = 0 ;
*destination++ = 0xFF ; *destination++ = 0 ;
*destination++ = 0xFF ; }
else
{
*destination++ = 0xFF ;
*destination++ = 0xFF ;
*destination++ = 0xFF ;
*destination++ = 0xFF ;
}
} }
} }
}
EndRawAccess() ; EndRawAccess() ;
} }
else else
{ {
wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
} }
} /* bitmapRefData->IsOk() */
} }
wxBitmap::wxBitmap(int w, int h, int d) wxBitmap::wxBitmap(int w, int h, int d)
@@ -1127,63 +1134,68 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();
m_refData = new wxBitmapRefData( width , height , depth ) ; wxBitmapRefData* bitmapRefData;
m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
// Create picture if ( bitmapRefData->IsOk())
bool hasAlpha = false ;
if ( image.HasMask() )
{ {
// takes precedence, don't mix with alpha info // Create picture
}
else
{
hasAlpha = image.HasAlpha() ;
}
if ( hasAlpha ) bool hasAlpha = false ;
UseAlpha() ;
unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ; if ( image.HasMask() )
register unsigned char* data = image.GetData();
if ( destinationstart != NULL && data != NULL )
{
const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
for (int y = 0; y < height; destinationstart += M_BITMAPDATA->GetBytesPerRow(), y++)
{ {
unsigned char * destination = destinationstart; // takes precedence, don't mix with alpha info
for (int x = 0; x < width; x++) }
{ else
if ( hasAlpha ) {
{ hasAlpha = image.HasAlpha() ;
const unsigned char a = *alpha++;
*destination++ = a ;
#if wxMAC_USE_PREMULTIPLIED_ALPHA
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
#else
*destination++ = *data++ ;
*destination++ = *data++ ;
*destination++ = *data++ ;
#endif
}
else
{
*destination++ = 0xFF ;
*destination++ = *data++ ;
*destination++ = *data++ ;
*destination++ = *data++ ;
}
}
} }
EndRawAccess() ; if ( hasAlpha )
} UseAlpha() ;
if ( image.HasMask() )
SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ; unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ;
register unsigned char* data = image.GetData();
if ( destinationstart != NULL && data != NULL )
{
const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
for (int y = 0; y < height; destinationstart += M_BITMAPDATA->GetBytesPerRow(), y++)
{
unsigned char * destination = destinationstart;
for (int x = 0; x < width; x++)
{
if ( hasAlpha )
{
const unsigned char a = *alpha++;
*destination++ = a ;
#if wxMAC_USE_PREMULTIPLIED_ALPHA
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
*destination++ = ((*data++) * a + 127) / 255 ;
#else
*destination++ = *data++ ;
*destination++ = *data++ ;
*destination++ = *data++ ;
#endif
}
else
{
*destination++ = 0xFF ;
*destination++ = *data++ ;
*destination++ = *data++ ;
*destination++ = *data++ ;
}
}
}
EndRawAccess() ;
}
if ( image.HasMask() )
SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
} /* bitmapRefData->IsOk() */
} }
wxImage wxBitmap::ConvertToImage() const wxImage wxBitmap::ConvertToImage() const