X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abb4f9c93715f5b00c526203af96ed2938a1a2c3..8786868c1bcc78b58df7dded6dc589a0e4a29a21:/src/mac/carbon/bitmap.cpp diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index 89f7b3496c..c1106bdfb0 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/mac/carbon/bitmap.cpp // Purpose: wxBitmap // Author: Stefan Csomor // Modified by: @@ -12,9 +12,14 @@ #include "wx/wxprec.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/log.h" -#include "wx/image.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif + #include "wx/metafile.h" #include "wx/xpmdecod.h" @@ -22,7 +27,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject ) #ifdef __DARWIN__ #include @@ -32,8 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject ) #include "wx/mac/uma.h" -#include "wx/dcmemory.h" - // Implementation Notes // -------------------- // @@ -44,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject ) // under Quartz then content is transformed into a CGImageRef representing the same data // which can be transferred to the GPU by the OS for fast rendering -// we don't dare premultiplied alpha yet +// we don't dare use premultiplied alpha yet #define wxMAC_USE_PREMULTIPLIED_ALPHA 0 #if wxUSE_BMPBUTTON @@ -61,7 +63,6 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi if ( ( bmap->HasNativeSize() && forceType == 0 ) || forceType == kControlContentIconRef ) { wxBitmap scaleBmp ; - wxBitmapRefData* bmp = bmap ; if ( !bmap->HasNativeSize() ) @@ -72,7 +73,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi int w = bitmap.GetWidth() ; int h = bitmap.GetHeight() ; int sz = wxMax( w , h ) ; - if ( sz == 24 || sz == 64) + if ( sz == 24 || sz == 64 ) { scaleBmp = wxBitmap( bitmap.ConvertToImage().Scale( w * 2 , h * 2 ) ) ; bmp = scaleBmp.GetBitmapData() ; @@ -83,7 +84,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi info->u.iconRef = bmp->GetIconRef() ; AcquireIconRef( info->u.iconRef ) ; } -#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 +#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 else if ( forceType == kControlContentCGImageRef ) { info->contentType = kControlContentCGImageRef ; @@ -92,8 +93,10 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi #endif else { +#ifndef __LP64__ info->contentType = kControlContentPictHandle ; info->u.picture = bmap->GetPictHandle() ; +#endif } } } @@ -112,7 +115,7 @@ void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) { // owned by the bitmap, no release here } -#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 +#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 else if ( info->contentType == kControlContentCGImageRef ) { CGImageRelease( info->u.imageRef ) ; @@ -135,9 +138,11 @@ void wxBitmapRefData::Init() m_depth = 0 ; m_ok = false ; m_bitmapMask = NULL ; + #ifdef __WXMAC_OSX__ m_cgImageRef = NULL ; #endif + m_iconRef = NULL ; m_pictHandle = NULL ; m_hBitmap = NULL ; @@ -148,6 +153,28 @@ void wxBitmapRefData::Init() m_hasAlpha = false; } +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) +{ + Init(); + Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth); + + if (tocopy.m_bitmapMask) + m_bitmapMask = new wxMask(*tocopy.m_bitmapMask); + + unsigned char* dest = (unsigned char*)GetRawAccess(); + unsigned char* source = (unsigned char*)tocopy.GetRawAccess(); + size_t numbytes = tocopy.m_width * tocopy.m_height * 4; + + for (size_t i=0; iGetRawAccess() : NULL ; + for ( int y = 0 ; y < h ; ++y ) { unsigned char * dest = ptr + y * sz * 4 ; unsigned char * maskdest = maskptr + y * sz ; + unsigned char a, r, g, b; + for ( int x = 0 ; x < w ; ++x ) { - unsigned char a = *source ++ ; - unsigned char r = *source ++ ; - unsigned char g = *source ++ ; - unsigned char b = *source ++ ; + a = *source ++ ; + r = *source ++ ; + g = *source ++ ; + b = *source ++ ; *dest++ = 0 ; *dest++ = r ; @@ -348,7 +395,12 @@ IconRef wxBitmapRefData::GetIconRef() *dest++ = b ; if ( mask ) - *maskdest++ = *masksource++ ; + { + *maskdest++ = 0xFF - *masksource++ ; + masksource++ ; + masksource++ ; + masksource++ ; + } else if ( hasAlpha ) *maskdest++ = a ; else @@ -361,6 +413,7 @@ IconRef wxBitmapRefData::GetIconRef() err = SetIconFamilyData( iconFamily, maskType , maskdata ) ; wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ; + HUnlock( data ) ; HUnlock( maskdata ) ; DisposeHandle( data ) ; @@ -371,21 +424,27 @@ IconRef wxBitmapRefData::GetIconRef() PicHandle pic = GetPictHandle() ; SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ; } - // transform into IconRef - +#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + // cleaner version existing from 10.3 upwards + HLock((Handle) iconFamily); + OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &m_iconRef ); + HUnlock((Handle) iconFamily); + wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") ); +#else static int iconCounter = 2 ; -#ifdef __WXDEBUG__ - OSStatus err = -#endif - RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ; + + OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ; wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; + // we have to retain a reference, as Unregister will decrement it AcquireIconRef( m_iconRef ) ; UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ; - DisposeHandle( (Handle) iconFamily ) ; ++iconCounter ; +#endif + DisposeHandle( (Handle) iconFamily ) ; } + return m_iconRef ; } @@ -393,21 +452,20 @@ PicHandle wxBitmapRefData::GetPictHandle() { if ( m_pictHandle == NULL ) { - CGrafPtr origPort = NULL ; - GDHandle origDev = NULL ; - GWorldPtr wp = NULL ; - GWorldPtr mask = NULL ; +#ifndef __LP64__ + CGrafPtr origPort = NULL ; + GDHandle origDev = NULL ; + GWorldPtr wp = NULL ; + GWorldPtr mask = NULL ; int height = GetHeight() ; int width = GetWidth() ; Rect rect = { 0 , 0 , height , width } ; + RgnHandle clipRgn = NULL ; GetGWorld( &origPort , &origDev ) ; - wp = GetHBITMAP( &mask ) ; - RgnHandle clipRgn = NULL ; - if ( mask ) { GWorldPtr monoworld ; @@ -417,16 +475,19 @@ PicHandle wxBitmapRefData::GetPictHandle() LockPixels( GetGWorldPixMap( monoworld ) ) ; LockPixels( GetGWorldPixMap( mask ) ) ; SetGWorld( monoworld , NULL ) ; - RGBColor white = { 0xffff ,0xffff , 0xffff } ; - RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; + + RGBColor white = { 0xffff , 0xffff , 0xffff } ; + RGBColor black = { 0x0000 , 0x0000 , 0x0000 } ; RGBForeColor( &black ) ; RGBBackColor( &white ) ; + CopyBits(GetPortBitMapForCopyBits(mask), GetPortBitMapForCopyBits(monoworld), &rect, &rect, - srcCopy,NULL); + srcCopy, NULL); BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( monoworld ) ) ; + UnlockPixels( GetGWorldPixMap( monoworld ) ) ; UnlockPixels( GetGWorldPixMap( mask ) ) ; DisposeGWorld( monoworld ) ; @@ -437,10 +498,11 @@ PicHandle wxBitmapRefData::GetPictHandle() GetPortBounds( wp , &portRect ) ; m_pictHandle = OpenPicture(&portRect); - if(m_pictHandle) + if (m_pictHandle) { - RGBColor white = { 0xffff ,0xffff , 0xffff } ; - RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ; + RGBColor white = { 0xffff , 0xffff , 0xffff } ; + RGBColor black = { 0x0000 , 0x0000 , 0x0000 } ; + RGBForeColor( &black ) ; RGBBackColor( &white ) ; @@ -456,10 +518,13 @@ PicHandle wxBitmapRefData::GetPictHandle() UnlockPixels( GetGWorldPixMap( wp ) ) ; ClosePicture(); } + SetGWorld( origPort , origDev ) ; if ( clipRgn ) DisposeRgn( clipRgn ) ; +#endif } + return m_pictHandle ; } @@ -467,7 +532,9 @@ PicHandle wxBitmapRefData::GetPictHandle() void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size) { wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ; + wxASSERT( data == membuf->GetData() ) ; + delete membuf ; } @@ -487,41 +554,66 @@ CGImageRef wxBitmapRefData::CGImageCreate() const if ( m_bitmapMask ) { + alphaInfo = kCGImageAlphaFirst ; membuf = new wxMemoryBuffer( imageSize ) ; memcpy( membuf->GetData() , dataBuffer , imageSize ) ; unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ; int maskrowbytes = m_bitmapMask->GetBytesPerRow() ; unsigned char *destalpha = (unsigned char *) membuf->GetData() ; - alphaInfo = kCGImageAlphaFirst ; for ( int y = 0 ; y < h ; ++y , sourcemaskstart += maskrowbytes) { unsigned char *sourcemask = sourcemaskstart ; - for( int x = 0 ; x < w ; ++x , sourcemask++ , destalpha += 4 ) + for ( int x = 0 ; x < w ; ++x , sourcemask += 4 , destalpha += 4 ) { - *destalpha = *sourcemask ; + *destalpha = 0xFF - *sourcemask ; } } } - else if ( m_hasAlpha ) + else { + if ( m_hasAlpha ) + { #if wxMAC_USE_PREMULTIPLIED_ALPHA - alphaInfo = kCGImageAlphaPremultipliedFirst ; + alphaInfo = kCGImageAlphaPremultipliedFirst ; #else - alphaInfo = kCGImageAlphaFirst ; + alphaInfo = kCGImageAlphaFirst ; #endif + } + membuf = new wxMemoryBuffer( m_memBuf ) ; } - else + + CGDataProviderRef dataProvider = NULL ; + if ( m_depth == 1 ) { - membuf = new wxMemoryBuffer( m_memBuf ) ; + wxMemoryBuffer* maskBuf = new wxMemoryBuffer( m_width * m_height ); + unsigned char * maskBufData = (unsigned char *) maskBuf->GetData(); + unsigned char * bufData = (unsigned char *) membuf->GetData() ; + // copy one color component + for( int i = 0 ; i < m_width * m_height ; ++i ) + maskBufData[i] = bufData[i*4+3]; + dataProvider = + CGDataProviderCreateWithData( + maskBuf , (const void *) maskBufData , m_width * m_height, + wxMacMemoryBufferReleaseProc ); + // as we are now passing the mask buffer to the data provider, we have + // to release the membuf ourselves + delete membuf ; + + image = ::CGImageMaskCreate( w, h, 8, 8, m_width , dataProvider, NULL, false ); } - CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace(); - CGDataProviderRef dataProvider = - CGDataProviderCreateWithData( membuf , (const void *)membuf->GetData() , imageSize, - wxMacMemoryBufferReleaseProc ); - image = - ::CGImageCreate( w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo , + else + { + CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace(); + dataProvider = + CGDataProviderCreateWithData( + membuf , (const void *)membuf->GetData() , imageSize, + wxMacMemoryBufferReleaseProc ); + image = + ::CGImageCreate( + w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo , dataProvider, NULL , false , kCGRenderingIntentDefault ); + } CGDataProviderRelease( dataProvider); } else @@ -529,12 +621,14 @@ CGImageRef wxBitmapRefData::CGImageCreate() const image = m_cgImageRef ; CGImageRetain( image ) ; } + if ( m_rawAccessCount == 0 && m_cgImageRef == NULL) { // we keep it for later use m_cgImageRef = image ; CGImageRetain( image ) ; } + return image ; } #endif @@ -546,20 +640,24 @@ GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const { *mask = NULL ; if ( m_bitmapMask ) + { *mask = (GWorldPtr) m_bitmapMask->GetHBITMAP() ; + } else if ( m_hasAlpha ) { #if !wxMAC_USE_CORE_GRAPHICS if ( m_rawAccessCount > 0 ) UpdateAlphaMask() ; #else - // this structure is not kept in synch when using CG, so if someone - // is really accessing the Graphports, we have to sync it + // this structure is not kept in synch when using CG, so if something + // is really accessing the GrafPorts, we have to sync it UpdateAlphaMask() ; #endif + *mask = m_hMaskBitmap ; } } + return m_hBitmap ; } @@ -576,7 +674,8 @@ void wxBitmapRefData::UpdateAlphaMask() const for ( int y = 0 ; y < h ; ++y , destalphabase += m_maskBytesPerRow ) { unsigned char* destalpha = destalphabase ; - for( int x = 0 ; x < w ; ++x , sourcemask += 4 ) + + for ( int x = 0 ; x < w ; ++x , sourcemask += 4 ) { // we must have 24 bit depth for non quartz smooth alpha *destalpha++ = 255 ; @@ -599,27 +698,32 @@ void wxBitmapRefData::Free() m_cgImageRef = NULL ; } #endif + if ( m_iconRef ) { ReleaseIconRef( m_iconRef ) ; m_iconRef = NULL ; } + +#ifndef __LP64__ if ( m_pictHandle ) { KillPicture( m_pictHandle ) ; m_pictHandle = NULL ; } + if ( m_hBitmap ) { DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ; m_hBitmap = NULL ; } + if ( m_hMaskBitmap ) { DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ; m_hMaskBitmap = NULL ; } - +#endif if (m_bitmapMask) { delete m_bitmapMask; @@ -634,53 +738,56 @@ wxBitmapRefData::~wxBitmapRefData() bool wxBitmap::CopyFromIcon(const wxIcon& icon) { + bool created = false ; int w = icon.GetWidth() ; int h = icon.GetHeight() ; - Create( icon.GetWidth() , icon.GetHeight() ) ; - bool created = false ; - if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) ) { IconFamilyHandle iconFamily = NULL ; - Handle imagehandle = NewHandle(0) ; - Handle maskhandle = NewHandle(0) ; + Handle imagehandle = NewHandle( 0 ) ; + Handle maskhandle = NewHandle( 0 ) ; OSType maskType = 0; OSType dataType = 0; IconSelectorValue selector = 0 ; - if ( w == 128 ) - { - dataType = kThumbnail32BitData ; - maskType = kThumbnail8BitMask ; - selector = kSelectorAllAvailableData ; - } - else if ( w == 48 ) - { - dataType = kHuge32BitData ; - maskType = kHuge8BitMask ; - selector = kSelectorHuge32Bit | kSelectorHuge8BitMask ; - } - else if ( w == 32 ) - { - dataType = kLarge32BitData ; - maskType = kLarge8BitMask ; - selector = kSelectorLarge32Bit | kSelectorLarge8BitMask ; - } - else if ( w == 16 ) + + switch (w) { - dataType = kSmall32BitData ; - maskType = kSmall8BitMask ; - selector = kSelectorSmall32Bit | kSelectorSmall8BitMask ; + case 128: + dataType = kThumbnail32BitData ; + maskType = kThumbnail8BitMask ; + selector = kSelectorAllAvailableData ; + break; + + case 48: + dataType = kHuge32BitData ; + maskType = kHuge8BitMask ; + selector = kSelectorHuge32Bit | kSelectorHuge8BitMask ; + break; + + case 32: + dataType = kLarge32BitData ; + maskType = kLarge8BitMask ; + selector = kSelectorLarge32Bit | kSelectorLarge8BitMask ; + break; + + case 16: + dataType = kSmall32BitData ; + maskType = kSmall8BitMask ; + selector = kSelectorSmall32Bit | kSelectorSmall8BitMask ; + break; + + default: + break; } + OSStatus err = IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , selector , &iconFamily ) ; - OSStatus err = ( IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , selector , &iconFamily ) ) ; - - err =( GetIconFamilyData( iconFamily , dataType , imagehandle ) ) ; - err =( GetIconFamilyData( iconFamily , maskType , maskhandle ) ) ; + err = GetIconFamilyData( iconFamily , dataType , imagehandle ) ; + err = GetIconFamilyData( iconFamily , maskType , maskhandle ) ; size_t imagehandlesize = GetHandleSize( imagehandle ) ; size_t maskhandlesize = GetHandleSize( maskhandle ) ; @@ -688,11 +795,13 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) { wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ; wxASSERT( GetHandleSize( maskhandle ) == w * h ) ; + UseAlpha() ; + unsigned char *source = (unsigned char *) *imagehandle ; unsigned char *sourcemask = (unsigned char *) *maskhandle ; - unsigned char* destination = (unsigned char*) BeginRawAccess() ; + for ( int y = 0 ; y < h ; ++y ) { for ( int x = 0 ; x < w ; ++x ) @@ -704,13 +813,14 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) *destination++ = *source++ ; } } + EndRawAccess() ; DisposeHandle( imagehandle ) ; DisposeHandle( maskhandle ) ; created = true ; } - DisposeHandle( (Handle) iconFamily ) ; + DisposeHandle( (Handle) iconFamily ) ; } if ( !created ) @@ -720,6 +830,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) dc.DrawIcon( icon , 0 , 0 ) ; dc.SelectObject( wxNullBitmap ) ; } + return true; } @@ -738,18 +849,22 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits if ( no_bits == 1 ) { int linesize = ( the_width / (sizeof(unsigned char) * 8)) ; - if ( the_width % (sizeof(unsigned char) * 8) ) { + if ( the_width % (sizeof(unsigned char) * 8) ) linesize += sizeof(unsigned char); - } + unsigned char* linestart = (unsigned char*) bits ; unsigned char* destination = (unsigned char*) BeginRawAccess() ; + for ( int y = 0 ; y < the_height ; ++y , linestart += linesize ) { + int index, bit, mask; + for ( int x = 0 ; x < the_width ; ++x ) { - int index = x / 8 ; - int bit = x % 8 ; - int mask = 1 << bit ; + index = x / 8 ; + bit = x % 8 ; + mask = 1 << bit ; + if ( linestart[index] & mask ) { *destination++ = 0xFF ; @@ -766,6 +881,7 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits } } } + EndRawAccess() ; } else @@ -779,7 +895,7 @@ wxBitmap::wxBitmap(int w, int h, int d) (void)Create(w, h, d); } -wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth) +wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth) { (void) Create(data, type, width, height, depth); } @@ -789,52 +905,42 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) LoadFile(filename, type); } -wxBitmap::wxBitmap(const char **bits) +wxObjectRefData* wxBitmap::CreateRefData() const { - (void) CreateFromXpm(bits); + return new wxBitmapRefData; } -wxBitmap::wxBitmap(char **bits) +wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const { - (void) CreateFromXpm((const char **)bits); + return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data)); } -void* wxBitmap::GetRawAccess() const +void * wxBitmap::GetRawAccess() const { wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->GetRawAccess() ; } -void* wxBitmap::BeginRawAccess() +void * wxBitmap::BeginRawAccess() { wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->BeginRawAccess() ; } void wxBitmap::EndRawAccess() { wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ; - M_BITMAPDATA->EndRawAccess() ; -} -bool wxBitmap::CreateFromXpm(const char **bits) -{ -#if wxUSE_IMAGE - wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ) - wxXPMDecoder decoder; - wxImage img = decoder.ReadData(bits); - wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") ) - *this = wxBitmap(img); - return true; -#else - return false; -#endif + M_BITMAPDATA->EndRawAccess() ; } #ifdef __WXMAC_OSX__ WXCGIMAGEREF wxBitmap::CGImageCreate() const { wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; + return M_BITMAPDATA->CGImageCreate() ; } #endif @@ -847,45 +953,52 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); - wxBitmap ret( rect.width, rect.height, GetDepth() ); wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); - int sourcewidth = GetWidth() ; int destwidth = rect.width ; int destheight = rect.height ; + { - unsigned char * sourcedata = (unsigned char*) GetRawAccess() ; - unsigned char * destdata = (unsigned char*) ret.BeginRawAccess() ; + unsigned char *sourcedata = (unsigned char*) GetRawAccess() ; + unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ; + wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ; + int sourcelinesize = sourcewidth * 4 ; int destlinesize = destwidth * 4 ; unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ; unsigned char *dest = destdata ; - for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) + + for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) { memcpy( dest , source , destlinesize ) ; } } + ret.EndRawAccess() ; if ( M_BITMAPDATA->m_bitmapMask ) { wxMemoryBuffer maskbuf ; - int rowBytes = ( destwidth + 3 ) & 0xFFFFFFC ; + int rowBytes = ( destwidth * 4 + 3 ) & 0xFFFFFFC ; size_t maskbufsize = rowBytes * destheight ; - unsigned char * destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ; - int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ; + int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ; int destlinesize = rowBytes ; + unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ; - source += rect.x + rect.y * sourcelinesize ; + unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ; + wxASSERT( (source != NULL) && (destdata != NULL) ) ; + + source += rect.x * 4 + rect.y * sourcelinesize ; unsigned char *dest = destdata ; - for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) + for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize) { memcpy( dest , source , destlinesize ) ; } + maskbuf.UngetWriteBuf( maskbufsize ) ; ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ; } @@ -923,17 +1036,21 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { #if wxUSE_IMAGE wxImage loadimage(filename, type); - if (loadimage.Ok()) { + if (loadimage.Ok()) + { *this = loadimage; + return true; } #endif } + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); + return false; } -bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth) +bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth) { UnRef(); @@ -941,7 +1058,8 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int wxBitmapHandler *handler = FindHandler(type); - if ( handler == NULL ) { + if ( handler == NULL ) + { wxLogWarning(wxT("no bitmap handler for type %d defined."), type); return false; @@ -954,7 +1072,7 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int wxBitmap::wxBitmap(const wxImage& image, int depth) { - wxCHECK_RET( image.Ok(), wxT("invalid image") ) + wxCHECK_RET( image.Ok(), wxT("invalid image") ); // width and height of the device-dependent bitmap int width = image.GetWidth(); @@ -979,9 +1097,9 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) UseAlpha() ; unsigned char* destination = (unsigned char*) BeginRawAccess() ; - register unsigned char* data = image.GetData(); const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ; + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) @@ -990,10 +1108,11 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) { 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 ; + *destination++ = ((*data++) * a + 127) / 255 ; + *destination++ = ((*data++) * a + 127) / 255 ; + *destination++ = ((*data++) * a + 127) / 255 ; #else *destination++ = *data++ ; *destination++ = *data++ ; @@ -1009,11 +1128,10 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) } } } + EndRawAccess() ; if ( image.HasMask() ) - { SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ; - } } wxImage wxBitmap::ConvertToImage() const @@ -1037,10 +1155,9 @@ wxImage wxBitmap::ConvertToImage() const int maskBytesPerRow = 0 ; unsigned char *alpha = NULL ; unsigned char *mask = NULL ; + if ( HasAlpha() ) - { hasAlpha = true ; - } if ( GetMask() ) { @@ -1054,11 +1171,12 @@ wxImage wxBitmap::ConvertToImage() const image.SetAlpha() ; alpha = image.GetAlpha() ; } + int index = 0; // The following masking algorithm is the same as well in msw/gtk: // the colour used as transparent one in wxImage and the one it is - // replaced with when it really occurs in the bitmap + // replaced with when it actually occurs in the bitmap static const int MASK_RED = 1; static const int MASK_GREEN = 2; static const int MASK_BLUE = 3; @@ -1067,16 +1185,26 @@ wxImage wxBitmap::ConvertToImage() const for (int yy = 0; yy < height; yy++ , mask += maskBytesPerRow ) { unsigned char * maskp = mask ; + unsigned char a, r, g, b; + long color; + for (int xx = 0; xx < width; xx++) { - long color = *((long*) source) ; - unsigned char a = ((color&0xFF000000) >> 24) ; - unsigned char r = ((color&0x00FF0000) >> 16) ; - unsigned char g = ((color&0x0000FF00) >> 8) ; - unsigned char b = (color&0x000000FF); + color = *((long*) source) ; +#ifdef WORDS_BIGENDIAN + a = ((color&0xFF000000) >> 24) ; + r = ((color&0x00FF0000) >> 16) ; + g = ((color&0x0000FF00) >> 8) ; + b = (color&0x000000FF); +#else + b = ((color&0xFF000000) >> 24) ; + g = ((color&0x00FF0000) >> 16) ; + r = ((color&0x0000FF00) >> 8) ; + a = (color&0x000000FF); +#endif if ( hasMask ) { - if ( *maskp++ == 0 ) + if ( *maskp++ == 0xFF ) { r = MASK_RED ; g = MASK_GREEN ; @@ -1084,6 +1212,10 @@ wxImage wxBitmap::ConvertToImage() const } else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE ) b = MASK_BLUE_REPLACEMENT ; + + maskp++ ; + maskp++ ; + maskp++ ; } else if ( hasAlpha ) *alpha++ = a ; @@ -1091,19 +1223,22 @@ wxImage wxBitmap::ConvertToImage() const data[index ] = r ; data[index + 1] = g ; data[index + 2] = b ; + index += 3; source += 4 ; } } + if ( hasMask ) image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); + return image; } #endif //wxUSE_IMAGE -bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, - const wxPalette *palette) const +bool wxBitmap::SaveFile( const wxString& filename, + wxBitmapType type, const wxPalette *palette ) const { bool success = false; wxBitmapHandler *handler = FindHandler(type); @@ -1125,7 +1260,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, return success; } -bool wxBitmap::Ok() const +bool wxBitmap::IsOk() const { return (M_BITMAPDATA && M_BITMAPDATA->Ok()); } @@ -1151,15 +1286,6 @@ int wxBitmap::GetDepth() const return M_BITMAPDATA->GetDepth(); } -#if WXWIN_COMPATIBILITY_2_4 - -int wxBitmap::GetQuality() const -{ - return 0; -} - -#endif - wxMask *wxBitmap::GetMask() const { wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); @@ -1176,41 +1302,25 @@ bool wxBitmap::HasAlpha() const void wxBitmap::SetWidth(int w) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BITMAPDATA->SetWidth(w); } void wxBitmap::SetHeight(int h) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BITMAPDATA->SetHeight(h); } void wxBitmap::SetDepth(int d) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BITMAPDATA->SetDepth(d); } -#if WXWIN_COMPATIBILITY_2_4 - -void wxBitmap::SetQuality(int WXUNUSED(quality)) -{ -} - -#endif - void wxBitmap::SetOk(bool isOk) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BITMAPDATA->SetOk(isOk); } @@ -1224,18 +1334,14 @@ wxPalette *wxBitmap::GetPalette() const void wxBitmap::SetPalette(const wxPalette& palette) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BITMAPDATA->m_bitmapPalette = palette ; } #endif // wxUSE_PALETTE void wxBitmap::SetMask(wxMask *mask) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; - + AllocExclusive(); // Remove existing mask if there is one. delete M_BITMAPDATA->m_bitmapMask; @@ -1256,35 +1362,58 @@ wxMask::wxMask() Init() ; } +wxMask::wxMask(const wxMask &tocopy) +{ + Init(); + + m_bytesPerRow = tocopy.m_bytesPerRow; + m_width = tocopy.m_width; + m_height = tocopy.m_height; + + size_t size = m_bytesPerRow * m_height; + unsigned char* dest = (unsigned char*)m_memBuf.GetWriteBuf( size ); + unsigned char* source = (unsigned char*)tocopy.m_memBuf.GetData(); + for (size_t i=0; i 0x10 ) - *destdata++ = 0x00 ; - else + { *destdata++ = 0xFF ; + *destdata++ = 0xFF ; + *destdata++ = 0xFF ; + *destdata++ = 0xFF ; + } + else + { + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + } } } + m_memBuf.UngetWriteBuf( size ) ; RealizeNative() ; + return true; } @@ -1361,29 +1519,47 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { m_width = bitmap.GetWidth() ; m_height = bitmap.GetHeight() ; - m_bytesPerRow = ( m_width + 3 ) & 0xFFFFFFC ; - size_t size = m_bytesPerRow * m_height ; + m_bytesPerRow = ( m_width * 4 + 3 ) & 0xFFFFFFC ; + size_t size = m_bytesPerRow * m_height ; unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ; + wxASSERT( destdatabase != NULL ) ; + memset( destdatabase , 0 , size ) ; unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ; + for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow) { - unsigned char *destdata= destdatabase ; - for( int x = 0 ; x < m_width ; ++x ) + unsigned char *destdata = destdatabase ; + unsigned char r, g, b; + + for ( int x = 0 ; x < m_width ; ++x ) { srcdata++ ; - unsigned char r = *srcdata++ ; - unsigned char g = *srcdata++ ; - unsigned char b = *srcdata++ ; - if ( colour == wxColour( r , g , b) ) - *destdata++ = 0x00 ; - else + r = *srcdata++ ; + g = *srcdata++ ; + b = *srcdata++ ; + + if ( colour == wxColour( r , g , b ) ) + { + *destdata++ = 0xFF ; *destdata++ = 0xFF ; + *destdata++ = 0xFF ; + *destdata++ = 0xFF ; + } + else + { + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + *destdata++ = 0x00 ; + } } } + m_memBuf.UngetWriteBuf( size ) ; RealizeNative() ; + return true; } @@ -1396,25 +1572,7 @@ WXHBITMAP wxMask::GetHBITMAP() const // wxBitmapHandler // ---------------------------------------------------------------------------- -wxBitmapHandler::~wxBitmapHandler() -{ -} - -bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) -{ - return false; -} - -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ - return false; -} - -bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) -{ - return false; -} +IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) // ---------------------------------------------------------------------------- // Standard Handlers @@ -1423,6 +1581,7 @@ bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler { DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler) + public: inline wxPICTResourceHandler() { @@ -1434,10 +1593,11 @@ public: virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight); }; + IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler) -bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, +bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight) { #if wxUSE_METAFILE @@ -1448,23 +1608,25 @@ bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo if ( thePict ) { wxMetafile mf ; - mf.SetHMETAFILE((WXHMETAFILE) thePict ) ; + + mf.SetHMETAFILE( (WXHMETAFILE) thePict ) ; bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ; wxMemoryDC dc ; dc.SelectObject( *bitmap ) ; mf.Play( &dc ) ; dc.SelectObject( wxNullBitmap ) ; + return true ; } -#endif //wxUSE_METAFILE +#endif + return false ; } - void wxBitmap::InitStandardHandlers() { - AddHandler(new wxPICTResourceHandler) ; - AddHandler(new wxICONResourceHandler) ; + AddHandler( new wxPICTResourceHandler ) ; + AddHandler( new wxICONResourceHandler ) ; } // ---------------------------------------------------------------------------- @@ -1474,68 +1636,24 @@ void wxBitmap::InitStandardHandlers() void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { if ( !Ok() ) - { // no bitmap, no data (raw or otherwise) return NULL; - } data.m_width = GetWidth() ; data.m_height = GetHeight() ; data.m_stride = GetWidth() * 4 ; - return GetRawAccess() ; + + return BeginRawAccess() ; } void wxBitmap::UngetRawData(wxPixelDataBase& dataBase) { - if ( !Ok() ) - return; - - // TODO : if we have some information about the API we should check - // this code looks strange... - - if ( M_BITMAPDATA->HasAlpha() ) - { - wxAlphaPixelData& data = (wxAlphaPixelData&)dataBase; - - int w = data.GetWidth(), - h = data.GetHeight(); - - wxBitmap bmpMask(GetWidth(), GetHeight(), 32); - wxAlphaPixelData dataMask(bmpMask, data.GetOrigin(), wxSize(w, h)); - wxAlphaPixelData::Iterator pMask(dataMask), - p(data); - for ( int y = 0; y < h; y++ ) - { - wxAlphaPixelData::Iterator rowStartMask = pMask, - rowStart = p; - - for ( int x = 0; x < w; x++ ) - { - const wxAlphaPixelData::Iterator::ChannelType - alpha = p.Alpha(); - - pMask.Red() = alpha; - pMask.Green() = alpha; - pMask.Blue() = alpha; - - ++p; - ++pMask; - } - - p = rowStart; - p.OffsetY(data, 1); - - pMask = rowStartMask; - pMask.OffsetY(dataMask, 1); - } - - SetMask(new wxMask(bmpMask)); - } + EndRawAccess() ; } void wxBitmap::UseAlpha() { - // remember that we are using alpha channel, we'll need to create a proper - // mask in UngetRawData() + // remember that we are using alpha channel: + // we'll need to create a proper mask in UngetRawData() M_BITMAPDATA->UseAlpha( true ); }