X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/bitmap.cpp?ds=inline diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index 3a66121d49..22ed227e5e 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -1,871 +1,1701 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/mac/carbon/bitmap.cpp // Purpose: wxBitmap -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bitmap.h" -#endif +#include "wx/wxprec.h" -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/log.h" -extern "C" -{ - #include "xpm.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" + +#include "wx/rawbmp.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) + +#include +#include + +#include "wx/mac/uma.h" + +// Implementation Notes +// -------------------- +// +// we are always working with a 32 bit deep pixel buffer +// under QuickDraw its alpha parts are going to be ignored in the GWorld, +// therefore we have a separate GWorld there for blitting the mask in + +// 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 + +class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData +{ + friend class WXDLLIMPEXP_FWD_CORE wxIcon; + friend class WXDLLIMPEXP_FWD_CORE wxCursor; +public: + wxBitmapRefData(int width , int height , int depth); + wxBitmapRefData(); + wxBitmapRefData(const wxBitmapRefData &tocopy); + + virtual ~wxBitmapRefData(); + + virtual bool IsOk() const { return m_ok; } + + void Free(); + void SetOk( bool isOk) { m_ok = isOk; } + + void SetWidth( int width ) { m_width = width; } + void SetHeight( int height ) { m_height = height; } + void SetDepth( int depth ) { m_depth = depth; } + + int GetWidth() const { return m_width; } + int GetHeight() const { return m_height; } + int GetDepth() const { return m_depth; } + + void *GetRawAccess() const; + void *BeginRawAccess(); + void EndRawAccess(); + + bool HasAlpha() const { return m_hasAlpha; } + void UseAlpha( bool useAlpha ); + +public: +#if wxUSE_PALETTE + wxPalette m_bitmapPalette; +#endif // wxUSE_PALETTE + + wxMask * m_bitmapMask; // Optional mask + CGImageRef CreateCGImage() const; + + // returns true if the bitmap has a size that + // can be natively transferred into a true icon + // if no is returned GetIconRef will still produce + // an icon but it will be generated via a PICT and + // rescaled to 16 x 16 + bool HasNativeSize(); + + // caller should increase ref count if needed longer + // than the bitmap exists + IconRef GetIconRef(); + + // returns a Pict from the bitmap content + PicHandle GetPictHandle(); + + CGContextRef GetBitmapContext() const; + + int GetBytesPerRow() const { return m_bytesPerRow; } + private : + bool Create(int width , int height , int depth); + void Init(); + + int m_width; + int m_height; + int m_bytesPerRow; + int m_depth; + bool m_hasAlpha; + wxMemoryBuffer m_memBuf; + int m_rawAccessCount; + bool m_ok; + mutable CGImageRef m_cgImageRef; + + IconRef m_iconRef; + PicHandle m_pictHandle; + + CGContextRef m_hBitmap; +}; + + +#define wxMAC_USE_PREMULTIPLIED_ALPHA 1 +static const int kBestByteAlignement = 16; +static const int kMaskBytesPerPixel = 1; + +static int GetBestBytesPerRow( int rawBytes ) +{ + return (((rawBytes)+kBestByteAlignement-1) & ~(kBestByteAlignement-1) ); +} + +#if wxUSE_GUI + +// this is used for more controls than just the wxBitmap button, also for notebooks etc + +void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType ) +{ + memset( info , 0 , sizeof(ControlButtonContentInfo) ) ; + if ( bitmap.Ok() ) + { + wxBitmapRefData * bmap = bitmap.GetBitmapData() ; + if ( bmap == NULL ) + return ; + + if ( forceType == 0 ) + { + forceType = kControlContentCGImageRef; + } + + if ( forceType == kControlContentIconRef ) + { + wxBitmap scaleBmp ; + wxBitmapRefData* bmp = bmap ; + + if ( !bmap->HasNativeSize() ) + { + // as PICT conversion will only result in a 16x16 icon, let's attempt + // a few scales for better results + + int w = bitmap.GetWidth() ; + int h = bitmap.GetHeight() ; + int sz = wxMax( w , h ) ; + if ( sz == 24 || sz == 64 ) + { + scaleBmp = wxBitmap( bitmap.ConvertToImage().Scale( w * 2 , h * 2 ) ) ; + bmp = scaleBmp.GetBitmapData() ; + } + } + + info->contentType = kControlContentIconRef ; + info->u.iconRef = bmp->GetIconRef() ; + AcquireIconRef( info->u.iconRef ) ; + } + else if ( forceType == kControlContentCGImageRef ) + { + info->contentType = kControlContentCGImageRef ; + info->u.imageRef = (CGImageRef) bmap->CreateCGImage() ; + } + else + { +#ifndef __LP64__ + info->contentType = kControlContentPictHandle ; + info->u.picture = bmap->GetPictHandle() ; #endif + } + } +} -#include - -CTabHandle wxMacCreateColorTable( int numColors ) -{ - CTabHandle newColors; /* Handle to the new color table */ - short index; /* Index into the table of colors */ - /* Allocate memory for the color table */ - newColors = (CTabHandle)NewHandleClear( sizeof (ColorTable) + - sizeof (ColorSpec) * (numColors - 1) ); - if (newColors != nil) - { - /* Initialize the fields */ - (**newColors).ctSeed = GetCTSeed(); - (**newColors).ctFlags = 0; - (**newColors).ctSize = numColors - 1; - /* Initialize the table of colors */ - } - return newColors ; -} - -void wxMacDestroyColorTable( CTabHandle colors ) -{ - DisposeHandle( (Handle) colors ) ; -} - -void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) -{ - (**newColors).ctTable[index].value = index; - (**newColors).ctTable[index].rgb.red = 0 ;// someRedValue; - (**newColors).ctTable[index].rgb.green = 0 ; // someGreenValue; - (**newColors).ctTable[index].rgb.blue = 0 ; // someBlueValue; -} - -GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) -{ - OSErr err = noErr ; - GWorldPtr port ; - Rect rect = { 0 , 0 , width , height } ; - - if ( depth < 0 ) - { - // get max pixel depth - CGrafPtr port ; - GetCWMgrPort( &port ) ; - GDHandle maxDevice ; - - maxDevice = GetMaxDevice( &port->portRect ) ; - if ( maxDevice ) - depth = (**((**maxDevice).gdPMap)).pixelSize ; - else - depth = 8 ; - } - - err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ; - if ( err == noErr ) - { - return port ; - } - return NULL ; -} - -void wxMacDestroyGWorld( GWorldPtr gw ) -{ - if ( gw ) - DisposeGWorld( gw ) ; +CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap ) +{ + wxBitmapRefData * bmap = bitmap.GetBitmapData() ; + if ( bmap == NULL ) + return NULL ; + return (CGImageRef) bmap->CreateCGImage(); } -wxBitmapRefData::wxBitmapRefData() +void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) { - m_ok = FALSE; - m_width = 0; - m_height = 0; - m_depth = 0; - m_quality = 0; - m_numColors = 0; - m_bitmapMask = NULL; - m_hBitmap = NULL ; - m_hPict = NULL ; - m_bitmapType = kMacBitmapTypeUnknownType ; + if ( info->contentType == kControlContentIconRef ) + { + ReleaseIconRef( info->u.iconRef ) ; + } + else if ( info->contentType == kControlNoContent ) + { + // there's no bitmap at all, fall through silently + } + else if ( info->contentType == kControlContentPictHandle ) + { + // owned by the bitmap, no release here + } + else if ( info->contentType == kControlContentCGImageRef ) + { + CGImageRelease( info->u.imageRef ) ; + } + else + { + wxFAIL_MSG(wxT("Unexpected bitmap type") ) ; + } } -wxBitmapRefData::~wxBitmapRefData() +#endif //wxUSE_BMPBUTTON + +#define M_BITMAPDATA ((wxBitmapRefData *)m_refData) + +void wxBitmapRefData::Init() { - switch (m_bitmapType) - { - case kMacBitmapTypePict : - { - if ( m_hPict ) - { - KillPicture( m_hPict ) ; - m_hPict = NULL ; - } - } - break ; - case kMacBitmapTypeGrafWorld : - { - if ( m_hBitmap ) - { - wxMacDestroyGWorld( m_hBitmap ) ; - m_hBitmap = NULL ; - } - } - break ; - default : - // unkown type ? - break ; - } ; - - if (m_bitmapMask) - { - delete m_bitmapMask; - m_bitmapMask = NULL; - } -} - -wxList wxBitmap::sm_handlers; + m_width = 0 ; + m_height = 0 ; + m_depth = 0 ; + m_bytesPerRow = 0; + m_ok = false ; + m_bitmapMask = NULL ; + m_cgImageRef = NULL ; + + m_iconRef = NULL ; + m_pictHandle = NULL ; + m_hBitmap = NULL ; + + m_rawAccessCount = 0 ; + m_hasAlpha = false; +} -wxBitmap::wxBitmap() +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) { - m_refData = NULL; + Init(); + Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth); + + if (tocopy.m_bitmapMask) + m_bitmapMask = new wxMask(*tocopy.m_bitmapMask); + else if (tocopy.m_hasAlpha) + UseAlpha(true); + + unsigned char* dest = (unsigned char*)GetRawAccess(); + unsigned char* source = (unsigned char*)tocopy.GetRawAccess(); + size_t numbytes = m_bytesPerRow * m_height; + memcpy( dest, source, numbytes ); +} - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); +wxBitmapRefData::wxBitmapRefData() +{ + Init() ; } -wxBitmap::~wxBitmap() +wxBitmapRefData::wxBitmapRefData( int w , int h , int d ) { - if (wxTheBitmapList) - wxTheBitmapList->DeleteObject(this); + Init() ; + Create( w , h , d ) ; } -wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) +bool wxBitmapRefData::Create( int w , int h , int d ) { - m_refData = new wxBitmapRefData; + m_width = wxMax(1, w); + m_height = wxMax(1, h); + m_depth = d ; - M_BITMAPDATA->m_width = the_width ; - M_BITMAPDATA->m_height = the_height ; - M_BITMAPDATA->m_depth = no_bits ; - M_BITMAPDATA->m_numColors = 0; - if ( no_bits == 1 ) - { - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; - - CGrafPtr origPort ; - GDHandle origDevice ; - - GetGWorld( &origPort , &origDevice ) ; - SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ; - - // bits is a word aligned array - - unsigned char* linestart = (unsigned char*) bits ; - int linesize = ( the_width / 16 ) * 2 ; - if ( the_width % 16 ) - { - linesize += 2 ; - } ; - - RGBColor colors[2] = { - { 0xFFFF , 0xFFFF , 0xFFFF } , - { 0, 0 , 0 } - } ; - - for( int y = 0 ; y < the_height ; ++y , linestart += linesize ) - { - for( int x = 0 ; x < the_width ; ++x ) - { - int index = x / 8 ; - int bit = x % 8 ; - int mask = 1 << bit ; - if ( linestart[index] & mask ) - { - SetCPixel( x , y , &colors[1] ) ; - } - else - { - SetCPixel( x , y , &colors[0] ) ; - } - } - - } - - SetGWorld( origPort , origDevice ) ; - } - else - { - //multicolor BITMAPs not yet implemented - } + m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ; + size_t size = m_bytesPerRow * h ; + void* data = m_memBuf.GetWriteBuf( size ) ; + memset( data , 0 , size ) ; + m_memBuf.UngetWriteBuf( size ) ; + + m_hBitmap = NULL ; + 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 ); - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + m_ok = ( m_hBitmap != NULL ) ; + + return m_ok ; } -wxBitmap::wxBitmap(int w, int h, int d) +void wxBitmapRefData::UseAlpha( bool use ) { - (void)Create(w, h, d); + if ( m_hasAlpha == use ) + return ; + + m_hasAlpha = use ; - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + CGContextRelease( m_hBitmap ); + m_hBitmap = CGBitmapContextCreate((char*) m_memBuf.GetData(), m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), m_hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst ); + wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ; + CGContextTranslateCTM( m_hBitmap, 0, m_height ); + CGContextScaleCTM( m_hBitmap, 1, -1 ); } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +void *wxBitmapRefData::GetRawAccess() const { - (void) Create(data, type, width, height, depth); + wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ; + return m_memBuf.GetData() ; +} - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); +void *wxBitmapRefData::BeginRawAccess() +{ + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ) ; + wxASSERT( m_rawAccessCount == 0 ) ; + wxASSERT_MSG( m_pictHandle == NULL && m_iconRef == NULL , + wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ; + + ++m_rawAccessCount ; + + // we must destroy an existing cached image, as + // the bitmap data may change now + if ( m_cgImageRef ) + { + CGImageRelease( m_cgImageRef ) ; + m_cgImageRef = NULL ; + } + + return m_memBuf.GetData() ; } -wxBitmap::wxBitmap(const wxString& filename, long type) +void wxBitmapRefData::EndRawAccess() { - LoadFile(filename, (int)type); + wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ; + wxASSERT( m_rawAccessCount == 1 ) ; - if ( wxTheBitmapList ) - wxTheBitmapList->AddBitmap(this); + --m_rawAccessCount ; } -wxBitmap::wxBitmap(const char **data) +bool wxBitmapRefData::HasNativeSize() { - (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); + int w = GetWidth() ; + int h = GetHeight() ; + int sz = wxMax( w , h ) ; + + return ( sz == 128 || sz == 48 || sz == 32 || sz == 16 ); } -bool wxBitmap::Create(int w, int h, int d) +IconRef wxBitmapRefData::GetIconRef() { - UnRef(); + if ( m_iconRef == NULL ) + { + // Create Icon Family Handle + + IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle( 0 ); + + int w = GetWidth() ; + int h = GetHeight() ; + int sz = wxMax( w , h ) ; + + OSType dataType = 0 ; + OSType maskType = 0 ; + + switch (sz) + { + case 128: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( UMAGetSystemVersion() >= 0x1050 ) + { + dataType = kIconServices128PixelDataARGB ; + } + else +#endif + { + dataType = kThumbnail32BitData ; + maskType = kThumbnail8BitMask ; + } + break; + + case 48: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( UMAGetSystemVersion() >= 0x1050 ) + { + dataType = kIconServices48PixelDataARGB ; + } + else +#endif + { + dataType = kHuge32BitData ; + maskType = kHuge8BitMask ; + } + break; + + case 32: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( UMAGetSystemVersion() >= 0x1050 ) + { + dataType = kIconServices32PixelDataARGB ; + } + else +#endif + { + dataType = kLarge32BitData ; + maskType = kLarge8BitMask ; + } + break; + + case 16: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( UMAGetSystemVersion() >= 0x1050 ) + { + dataType = kIconServices16PixelDataARGB ; + } + else +#endif + { + dataType = kSmall32BitData ; + maskType = kSmall8BitMask ; + } + break; + + default: + break; + } + + if ( dataType != 0 ) + { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( maskType == 0 && UMAGetSystemVersion() >= 0x1050 ) + { + size_t datasize = sz * sz * 4 ; + Handle data = NewHandle( datasize ) ; + HLock( data ) ; + unsigned char* ptr = (unsigned char*) *data ; + memset( ptr, 0, datasize ); + bool hasAlpha = HasAlpha() ; + wxMask *mask = m_bitmapMask ; + unsigned char * sourcePtr = (unsigned char*) GetRawAccess() ; + unsigned char * masksourcePtr = mask ? (unsigned char*) mask->GetRawAccess() : NULL ; + + for ( int y = 0 ; y < h ; ++y, sourcePtr += m_bytesPerRow , masksourcePtr += mask ? mask->GetBytesPerRow() : 0 ) + { + unsigned char * source = sourcePtr; + unsigned char * masksource = masksourcePtr; + unsigned char * dest = ptr + y * sz * 4 ; + unsigned char a, r, g, b; + + for ( int x = 0 ; x < w ; ++x ) + { + a = *source ++ ; + r = *source ++ ; + g = *source ++ ; + b = *source ++ ; + + if ( mask ) + { + a = 0xFF - *masksource++ ; + } + else if ( !hasAlpha ) + a = 0xFF ; + else + { +#if wxMAC_USE_PREMULTIPLIED_ALPHA + // this must be non-premultiplied data + if ( a != 0xFF && a!= 0 ) + { + r = r * 255 / a; + g = g * 255 / a; + b = b * 255 / a; + } +#endif + } + *dest++ = a ; + *dest++ = r ; + *dest++ = g ; + *dest++ = b ; + + } + } + HUnlock( data ); + OSStatus err = SetIconFamilyData( iconFamily, dataType , data ); + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ); + DisposeHandle( data ); + } + else +#endif + { + // setup the header properly + + Handle data = NULL ; + Handle maskdata = NULL ; + unsigned char * maskptr = NULL ; + unsigned char * ptr = NULL ; + size_t datasize, masksize ; + + datasize = sz * sz * 4 ; + data = NewHandle( datasize ) ; + HLock( data ) ; + ptr = (unsigned char*) *data ; + memset( ptr , 0, datasize ) ; + + masksize = sz * sz ; + maskdata = NewHandle( masksize ) ; + HLock( maskdata ) ; + maskptr = (unsigned char*) *maskdata ; + memset( maskptr , 0 , masksize ) ; + + bool hasAlpha = HasAlpha() ; + wxMask *mask = m_bitmapMask ; + unsigned char * sourcePtr = (unsigned char*) GetRawAccess() ; + unsigned char * masksourcePtr = mask ? (unsigned char*) mask->GetRawAccess() : NULL ; + + for ( int y = 0 ; y < h ; ++y, sourcePtr += m_bytesPerRow , masksourcePtr += mask ? mask->GetBytesPerRow() : 0 ) + { + unsigned char * source = sourcePtr; + unsigned char * masksource = masksourcePtr; + 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 ) + { + a = *source ++ ; + r = *source ++ ; + g = *source ++ ; + b = *source ++ ; + + *dest++ = 0 ; + *dest++ = r ; + *dest++ = g ; + *dest++ = b ; + + if ( mask ) + *maskdest++ = 0xFF - *masksource++ ; + else if ( hasAlpha ) + *maskdest++ = a ; + else + *maskdest++ = 0xFF ; + } + } + + OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; + + err = SetIconFamilyData( iconFamily, maskType , maskdata ) ; + wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ; + + HUnlock( data ) ; + HUnlock( maskdata ) ; + DisposeHandle( data ) ; + DisposeHandle( maskdata ) ; + } + } + else + { + PicHandle pic = GetPictHandle() ; + SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ; + } + // transform into IconRef + + // 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") ); + DisposeHandle( (Handle) iconFamily ) ; + } - m_refData = new wxBitmapRefData; + return m_iconRef ; +} - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = d; +PicHandle wxBitmapRefData::GetPictHandle() +{ + if ( m_pictHandle == NULL ) + { +#ifndef __LP64__ + GraphicsExportComponent exporter = 0; + OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter); + if (noErr == err) + { + m_pictHandle = (PicHandle) NewHandle(0); + if ( m_pictHandle ) + { + // QT does not correctly export the mask + // TODO if we get around to it create a synthetic PICT with the CopyBits and Mask commands + CGImageRef imageRef = CreateCGImage(); + err = GraphicsExportSetInputCGImage( exporter, imageRef ); + err = GraphicsExportSetOutputHandle(exporter, (Handle)m_pictHandle); + err = GraphicsExportDoExport(exporter, NULL); + CGImageRelease( imageRef ); + + size_t handleSize = GetHandleSize( (Handle) m_pictHandle ); + // the 512 bytes header is only needed for pict files, but not in memory + if ( handleSize >= 512 ) + { + memmove( *m_pictHandle , (char*)(*m_pictHandle)+512, handleSize - 512 ); + SetHandleSize( (Handle) m_pictHandle, handleSize - 512 ); + } + } + CloseComponent( exporter ); + } +#endif + } - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( w , h , d ) ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; - return M_BITMAPDATA->m_ok; + return m_pictHandle ; } -void wxBitmap::SetHBITMAP(WXHBITMAP bmp) +CGImageRef wxBitmapRefData::CreateCGImage() const { - M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - M_BITMAPDATA->m_hBitmap = bmp ; - M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ; + wxASSERT( m_ok ) ; + wxASSERT( m_rawAccessCount >= 0 ) ; + CGImageRef image ; + if ( m_rawAccessCount > 0 || m_cgImageRef == NULL ) + { + if ( m_depth != 1 && m_bitmapMask == NULL ) + { + if ( m_bitmapMask ) + { + CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap ); + CGImageRef tempMask = CGBitmapContextCreateImage((CGContextRef) m_bitmapMask->GetHBITMAP() ); + image = CGImageCreateWithMask( tempImage, tempMask ); + CGImageRelease(tempMask); + CGImageRelease(tempImage); + } + else + image = CGBitmapContextCreateImage( m_hBitmap ); + } + else + { + size_t imageSize = m_height * m_bytesPerRow ; + void * dataBuffer = m_memBuf.GetData() ; + int w = m_width ; + int h = m_height ; + CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ; + wxMemoryBuffer membuf; + + if ( m_bitmapMask ) + { + alphaInfo = kCGImageAlphaFirst ; + unsigned char *destalphastart = (unsigned char*) membuf.GetWriteBuf( imageSize ) ; + memcpy( destalphastart , dataBuffer , imageSize ) ; + unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ; + int maskrowbytes = m_bitmapMask->GetBytesPerRow() ; + for ( int y = 0 ; y < h ; ++y , destalphastart += m_bytesPerRow, sourcemaskstart += maskrowbytes) + { + unsigned char *sourcemask = sourcemaskstart ; + unsigned char *destalpha = destalphastart ; + for ( int x = 0 ; x < w ; ++x , sourcemask += kMaskBytesPerPixel , destalpha += 4 ) + { + *destalpha = 0xFF - *sourcemask ; + } + } + membuf.UngetWriteBuf( imageSize ); + } + else + { + if ( m_hasAlpha ) + { +#if wxMAC_USE_PREMULTIPLIED_ALPHA + alphaInfo = kCGImageAlphaPremultipliedFirst ; +#else + alphaInfo = kCGImageAlphaFirst ; +#endif + } + + membuf = m_memBuf; + } + + CGDataProviderRef dataProvider = NULL ; + if ( m_depth == 1 ) + { + // TODO CHECK ALIGNMENT + wxMemoryBuffer maskBuf; + unsigned char * maskBufData = (unsigned char*) maskBuf.GetWriteBuf( m_width * m_height ); + unsigned char * bufData = (unsigned char *) membuf.GetData() ; + // copy one color component + size_t i = 0; + for( int y = 0 ; y < m_height ; bufData+= m_bytesPerRow, ++y ) + { + unsigned char *bufDataIter = bufData+3; + for ( int x = 0 ; x < m_width ; bufDataIter += 4, ++x, ++i ) + { + maskBufData[i] = *bufDataIter; + } + } + maskBuf.UngetWriteBuf( m_width * m_height ); + + dataProvider = + wxMacCGDataProviderCreateWithMemoryBuffer( maskBuf ); + + image = ::CGImageMaskCreate( w, h, 8, 8, m_width , dataProvider, NULL, false ); + } + else + { + CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace(); + dataProvider = wxMacCGDataProviderCreateWithMemoryBuffer( membuf ); + image = + ::CGImageCreate( + w, h, 8 , 32 , m_bytesPerRow , colorSpace, alphaInfo , + dataProvider, NULL , false , kCGRenderingIntentDefault ); + } + CGDataProviderRelease( dataProvider); + } + } + else + { + 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 ; } -bool wxBitmap::LoadFile(const wxString& filename, long type) +CGContextRef wxBitmapRefData::GetBitmapContext() const { - UnRef(); + return m_hBitmap; +} - m_refData = new wxBitmapRefData; +void wxBitmapRefData::Free() +{ + wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ; - wxBitmapHandler *handler = FindHandler(type); + if ( m_cgImageRef ) + { + CGImageRelease( m_cgImageRef ) ; + m_cgImageRef = NULL ; + } + + if ( m_iconRef ) + { + ReleaseIconRef( m_iconRef ) ; + m_iconRef = NULL ; + } - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); +#ifndef __LP64__ + if ( m_pictHandle ) + { + KillPicture( m_pictHandle ) ; + m_pictHandle = NULL ; + } +#endif - return FALSE; + if ( m_hBitmap ) + { + CGContextRelease(m_hBitmap); + m_hBitmap = NULL ; } - return handler->LoadFile(this, filename, type, -1, -1); + if (m_bitmapMask) + { + delete m_bitmapMask; + m_bitmapMask = NULL; + } } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +wxBitmapRefData::~wxBitmapRefData() { - UnRef(); + Free() ; +} - m_refData = new wxBitmapRefData; +bool wxBitmap::CopyFromIcon(const wxIcon& icon) +{ + bool created = false ; + int w = icon.GetWidth() ; + int h = icon.GetHeight() ; - wxBitmapHandler *handler = FindHandler(type); + Create( icon.GetWidth() , icon.GetHeight() ) ; - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); + if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) ) + { + IconFamilyHandle iconFamily = NULL ; + Handle imagehandle = NewHandle( 0 ) ; + Handle maskhandle = NewHandle( 0 ) ; + + OSType maskType = 0; + OSType dataType = 0; + IconSelectorValue selector = 0 ; + + switch (w) + { + 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 ) ; + + err = GetIconFamilyData( iconFamily , dataType , imagehandle ) ; + err = GetIconFamilyData( iconFamily , maskType , maskhandle ) ; + size_t imagehandlesize = GetHandleSize( imagehandle ) ; + size_t maskhandlesize = GetHandleSize( maskhandle ) ; + + if ( imagehandlesize != 0 && maskhandlesize != 0 ) + { + 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 ) + { + unsigned char a = *sourcemask++; + *destination++ = a; + source++ ; +#if wxMAC_USE_PREMULTIPLIED_ALPHA + *destination++ = ( (*source++) * a + 127 ) / 255; + *destination++ = ( (*source++) * a + 127 ) / 255; + *destination++ = ( (*source++) * a + 127 ) / 255; +#else + *destination++ = *source++ ; + *destination++ = *source++ ; + *destination++ = *source++ ; +#endif + } + } + + EndRawAccess() ; + DisposeHandle( imagehandle ) ; + DisposeHandle( maskhandle ) ; + created = true ; + } - return FALSE; + DisposeHandle( (Handle) iconFamily ) ; } - return handler->Create(this, data, type, width, height, depth); + if ( !created ) + { + wxMemoryDC dc ; + dc.SelectObject( *this ) ; + dc.DrawIcon( icon , 0 , 0 ) ; + dc.SelectObject( wxNullBitmap ) ; + } + + return true; } -bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette) +wxBitmap::wxBitmap() { - wxBitmapHandler *handler = FindHandler(type); +} - if ( handler == NULL ) { - wxLogWarning("no bitmap handler for type %d defined.", type); +wxBitmap::~wxBitmap() +{ +} - return FALSE; - } +wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) +{ + m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ; - return handler->SaveFile(this, filename, type, palette); + if ( no_bits == 1 ) + { + int linesize = ( 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* destptr = (unsigned char*) BeginRawAccess() ; + + for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() ) + { + unsigned char* destination = destptr; + int index, bit, mask; + + for ( int x = 0 ; x < the_width ; ++x ) + { + index = x / 8 ; + bit = x % 8 ; + mask = 1 << bit ; + + if ( linestart[index] & mask ) + { + *destination++ = 0xFF ; + *destination++ = 0 ; + *destination++ = 0 ; + *destination++ = 0 ; + } + else + { + *destination++ = 0xFF ; + *destination++ = 0xFF ; + *destination++ = 0xFF ; + *destination++ = 0xFF ; + } + } + } + + EndRawAccess() ; + } + else + { + wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented")); + } } -void wxBitmap::SetWidth(int w) +wxBitmap::wxBitmap(int w, int h, int d) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + (void)Create(w, h, d); +} - M_BITMAPDATA->m_width = w; +wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth) +{ + (void) Create(data, type, width, height, depth); } -void wxBitmap::SetHeight(int h) +wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + LoadFile(filename, type); +} - M_BITMAPDATA->m_height = h; +wxGDIRefData* wxBitmap::CreateGDIRefData() const +{ + return new wxBitmapRefData; } -void wxBitmap::SetDepth(int d) +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data)); +} - M_BITMAPDATA->m_depth = d; +void * wxBitmap::GetRawAccess() const +{ + wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + + return M_BITMAPDATA->GetRawAccess() ; } -void wxBitmap::SetQuality(int q) +void * wxBitmap::BeginRawAccess() { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; - M_BITMAPDATA->m_quality = q; + return M_BITMAPDATA->BeginRawAccess() ; } -void wxBitmap::SetOk(bool isOk) +void wxBitmap::EndRawAccess() { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ; - M_BITMAPDATA->m_ok = isOk; + M_BITMAPDATA->EndRawAccess() ; } -void wxBitmap::SetPalette(const wxPalette& palette) +CGImageRef wxBitmap::CreateCGImage() const { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; - M_BITMAPDATA->m_bitmapPalette = palette ; + return M_BITMAPDATA->CreateCGImage() ; } -void wxBitmap::SetMask(wxMask *mask) +IconRef wxBitmap::GetIconRef() const { - if (!M_BITMAPDATA) - m_refData = new wxBitmapRefData; + wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; - M_BITMAPDATA->m_bitmapMask = mask ; + return M_BITMAPDATA->GetIconRef() ; } -void wxBitmap::AddHandler(wxBitmapHandler *handler) +IconRef wxBitmap::CreateIconRef() const { - sm_handlers.Append(handler); + IconRef icon = GetIconRef(); + verify_noerr( AcquireIconRef(icon) ); + return icon; } -void wxBitmap::InsertHandler(wxBitmapHandler *handler) +wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const { - sm_handlers.Insert(handler); + wxCHECK_MSG( Ok() && + (rect.x >= 0) && (rect.y >= 0) && + (rect.x+rect.width <= GetWidth()) && + (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 destwidth = rect.width ; + int destheight = rect.height ; + + { + unsigned char *sourcedata = (unsigned char*) GetRawAccess() ; + unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ; + wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ; + + int sourcelinesize = GetBitmapData()->GetBytesPerRow() ; + int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ; + 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) + { + memcpy( dest , source , destlinesize ) ; + } + } + + ret.EndRawAccess() ; + + if ( M_BITMAPDATA->m_bitmapMask ) + { + wxMemoryBuffer maskbuf ; + int rowBytes = GetBestBytesPerRow( destwidth * kMaskBytesPerPixel ); + size_t maskbufsize = rowBytes * destheight ; + + int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ; + int destlinesize = rowBytes ; + + unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ; + unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ; + wxASSERT( (source != NULL) && (destdata != NULL) ) ; + + source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ; + unsigned char *dest = destdata ; + + 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 ) ) ; + } + else if ( HasAlpha() ) + ret.UseAlpha() ; + + return ret; } -bool wxBitmap::RemoveHandler(const wxString& name) +bool wxBitmap::Create(int w, int h, int d) { - wxBitmapHandler *handler = FindHandler(name); + UnRef(); + + if ( d < 0 ) + d = wxDisplayDepth() ; + + m_refData = new wxBitmapRefData( w , h , d ); + + return M_BITMAPDATA->IsOk() ; +} + +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) +{ + UnRef(); + + wxBitmapHandler *handler = FindHandler(type); + if ( handler ) { - sm_handlers.DeleteObject(handler); - return TRUE; + m_refData = new wxBitmapRefData; + + return handler->LoadFile(this, filename, type, -1, -1); } else - return FALSE; + { +#if wxUSE_IMAGE + wxImage loadimage(filename, type); + if (loadimage.Ok()) + { + *this = loadimage; + + return true; + } +#endif + } + + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); + + return false; } -wxBitmapHandler *wxBitmap::FindHandler(const wxString& name) +bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth) { - wxNode *node = sm_handlers.First(); - while ( node ) + UnRef(); + + m_refData = new wxBitmapRefData; + + wxBitmapHandler *handler = FindHandler(type); + + if ( handler == NULL ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetName() == name ) - return handler; - node = node->Next(); + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); + + return false; } - return NULL; + + return handler->Create(this, data, type, width, height, depth); } -wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType) +#if wxUSE_IMAGE + +wxBitmap::wxBitmap(const wxImage& image, int depth) { - wxNode *node = sm_handlers.First(); - while ( node ) + wxCHECK_RET( image.Ok(), wxT("invalid image") ); + + // width and height of the device-dependent bitmap + int width = image.GetWidth(); + int height = image.GetHeight(); + + m_refData = new wxBitmapRefData( width , height , depth ) ; + + // Create picture + + bool hasAlpha = false ; + + if ( image.HasMask() ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) - return handler; - node = node->Next(); + // takes precedence, don't mix with alpha info } - return NULL; + else + { + hasAlpha = image.HasAlpha() ; + } + + if ( hasAlpha ) + UseAlpha() ; + + 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() ) ) ) ; } -wxBitmapHandler *wxBitmap::FindHandler(long bitmapType) +wxImage wxBitmap::ConvertToImage() const { - wxNode *node = sm_handlers.First(); - while ( node ) + wxImage image; + + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + + // create an wxImage object + int width = GetWidth(); + int height = GetHeight(); + image.Create( width, height ); + + unsigned char *data = image.GetData(); + wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") ); + + unsigned char* sourcestart = (unsigned char*) GetRawAccess() ; + + bool hasAlpha = false ; + bool hasMask = false ; + int maskBytesPerRow = 0 ; + unsigned char *alpha = NULL ; + unsigned char *mask = NULL ; + + if ( HasAlpha() ) + hasAlpha = true ; + + if ( GetMask() ) + { + hasMask = true ; + mask = (unsigned char*) GetMask()->GetRawAccess() ; + maskBytesPerRow = GetMask()->GetBytesPerRow() ; + } + + if ( hasAlpha ) { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - if (handler->GetType() == bitmapType) - return handler; - node = node->Next(); + image.SetAlpha() ; + alpha = image.GetAlpha() ; } - return NULL; + + 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 actually occurs in the bitmap + static const int MASK_RED = 1; + static const int MASK_GREEN = 2; + static const int MASK_BLUE = 3; + static const int MASK_BLUE_REPLACEMENT = 2; + + for (int yy = 0; yy < height; yy++ , sourcestart += M_BITMAPDATA->GetBytesPerRow() , mask += maskBytesPerRow ) + { + unsigned char * maskp = mask ; + unsigned char * source = sourcestart; + unsigned char a, r, g, b; + long color; + + for (int xx = 0; xx < width; xx++) + { + 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++ == 0xFF ) + { + r = MASK_RED ; + g = MASK_GREEN ; + b = MASK_BLUE ; + } + else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE ) + b = MASK_BLUE_REPLACEMENT ; + } + else if ( hasAlpha ) + { + *alpha++ = a ; +#if wxMAC_USE_PREMULTIPLIED_ALPHA + // this must be non-premultiplied data + if ( a != 0xFF && a!= 0 ) + { + r = r * 255 / a; + g = g * 255 / a; + b = b * 255 / a; + } +#endif + } + + 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; } -/* - * wxMask - */ +#endif //wxUSE_IMAGE -wxMask::wxMask() +bool wxBitmap::SaveFile( const wxString& filename, + wxBitmapType type, const wxPalette *palette ) const { -/* TODO - m_maskBitmap = 0; -*/ + bool success = false; + wxBitmapHandler *handler = FindHandler(type); + + if ( handler ) + { + success = handler->SaveFile(this, filename, type, palette); + } + else + { +#if wxUSE_IMAGE + wxImage image = ConvertToImage(); + success = image.SaveFile(filename, type); +#else + wxLogWarning(wxT("no bitmap handler for type %d defined."), type); +#endif + } + + return success; } -// Construct a mask from a bitmap and a colour indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour) +int wxBitmap::GetHeight() const { -/* TODO - m_maskBitmap = 0; -*/ - Create(bitmap, colour); + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + + return M_BITMAPDATA->GetHeight(); } -// Construct a mask from a bitmap and a palette index indicating -// the transparent area -wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex) +int wxBitmap::GetWidth() const { -/* TODO - m_maskBitmap = 0; -*/ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - Create(bitmap, paletteIndex); + return M_BITMAPDATA->GetWidth() ; } -// Construct a mask from a mono bitmap (copies the bitmap). -wxMask::wxMask(const wxBitmap& bitmap) +int wxBitmap::GetDepth() const { -/* TODO - m_maskBitmap = 0; -*/ + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); - Create(bitmap); + return M_BITMAPDATA->GetDepth(); } -wxMask::~wxMask() +wxMask *wxBitmap::GetMask() const { -// TODO: delete mask bitmap + wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + + return M_BITMAPDATA->m_bitmapMask; } -// Create a mask from a mono bitmap (copies the bitmap). -bool wxMask::Create(const wxBitmap& bitmap) +bool wxBitmap::HasAlpha() const { -// TODO - return FALSE; + wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") ); + + return M_BITMAPDATA->HasAlpha() ; } -// Create a mask from a bitmap and a palette index indicating -// the transparent area -bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) +void wxBitmap::SetWidth(int w) { -// TODO - return FALSE; + AllocExclusive(); + M_BITMAPDATA->SetWidth(w); } -// Create a mask from a bitmap and a colour indicating -// the transparent area -bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) +void wxBitmap::SetHeight(int h) { -// TODO - return FALSE; + AllocExclusive(); + M_BITMAPDATA->SetHeight(h); } -/* - * wxBitmapHandler - */ - -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) +void wxBitmap::SetDepth(int d) +{ + AllocExclusive(); + M_BITMAPDATA->SetDepth(d); +} -bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) +void wxBitmap::SetOk(bool isOk) { - return FALSE; + AllocExclusive(); + M_BITMAPDATA->SetOk(isOk); } -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type, - int desiredWidth, int desiredHeight) +#if wxUSE_PALETTE +wxPalette *wxBitmap::GetPalette() const { - return FALSE; + wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap GetPalette()") ); + + return &M_BITMAPDATA->m_bitmapPalette; } -bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +void wxBitmap::SetPalette(const wxPalette& palette) { - return FALSE; + AllocExclusive(); + M_BITMAPDATA->m_bitmapPalette = palette ; } +#endif // wxUSE_PALETTE -/* - * Standard handlers - */ +void wxBitmap::SetMask(wxMask *mask) +{ + AllocExclusive(); + // Remove existing mask if there is one. + delete M_BITMAPDATA->m_bitmapMask; -class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler + M_BITMAPDATA->m_bitmapMask = mask ; +} + +WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const { - DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler) -public: - inline wxPICTResourceHandler() - { - m_name = "Macintosh Pict resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_PICT_RESOURCE; - }; + wxUnusedVar(mask); - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler) + return WXHBITMAP(M_BITMAPDATA->GetBitmapContext()); +} -bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ - Str255 theName ; - - strcpy( (char*) theName , name ) ; - c2pstr( (char*) theName ) ; - - PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ; - if ( thePict ) - { - PictInfo theInfo ; - - GetPictInfo( thePict , &theInfo , 0 , 0 , systemMethod , 0 ) ; - DetachResource( (Handle) thePict ) ; - M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypePict ; - M_BITMAPHANDLERDATA->m_hPict = thePict ; - M_BITMAPHANDLERDATA->m_width = theInfo.sourceRect.right - theInfo.sourceRect.left ; - M_BITMAPHANDLERDATA->m_height = theInfo.sourceRect.bottom - theInfo.sourceRect.top ; - - M_BITMAPHANDLERDATA->m_depth = theInfo.depth ; - M_BITMAPHANDLERDATA->m_ok = true ; - M_BITMAPHANDLERDATA->m_numColors = theInfo.uniqueColors ; -// M_BITMAPHANDLERDATA->m_bitmapPalette; -// M_BITMAPHANDLERDATA->m_quality; - return TRUE ; - } - return FALSE ; -} - -/* TODO: bitmap handlers, a bit like this: -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler() - { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; +// ---------------------------------------------------------------------------- +// wxMask +// ---------------------------------------------------------------------------- - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) -*/ +wxMask::wxMask() +{ + Init() ; +} -class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler +wxMask::wxMask(const wxMask &tocopy) { - DECLARE_DYNAMIC_CLASS(wxXPMFileHandler) -public: - inline wxXPMFileHandler(void) - { - m_name = "XPM bitmap file"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler) - -bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) -{ -#if USE_XPM_IN_MSW - XImage *ximage; - XpmAttributes xpmAttr; - HDC dc; - - M_BITMAPHANDLERDATA->m_ok = FALSE; - dc = CreateCompatibleDC(NULL); - if (dc) - { - xpmAttr.valuemask = XpmReturnPixels; - int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr); - DeleteDC(dc); - if (errorStatus == XpmSuccess) - { - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap; - - BITMAP bm; - GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm); - - M_BITMAPHANDLERDATA->m_width = (bm.bmWidth); - M_BITMAPHANDLERDATA->m_height = (bm.bmHeight); - M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel); - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - XImageFree(ximage); - - M_BITMAPHANDLERDATA->m_ok = TRUE; - return TRUE; - } - else - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - return FALSE; - } - } -#endif + 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(); + memcpy( dest, source, size ); + m_memBuf.UngetWriteBuf( size ) ; + RealizeNative() ; +} - return FALSE; +// Construct a mask from a bitmap and a colour indicating +// the transparent area +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) +{ + Init() ; + Create( bitmap, colour ); } -bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +// Construct a mask from a mono bitmap (copies the bitmap). +wxMask::wxMask( const wxBitmap& bitmap ) { -#if USE_XPM_IN_MSW - HDC dc = NULL; + Init() ; + Create( bitmap ); +} - Visual *visual = NULL; - XImage ximage; +// Construct a mask from a mono bitmap (copies the bitmap). - dc = CreateCompatibleDC(NULL); - if (dc) - { - if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap)) - { /* for following SetPixel */ - /* fill the XImage struct 'by hand' */ - ximage.width = M_BITMAPHANDLERDATA->m_width; - ximage.height = M_BITMAPHANDLERDATA->m_height; - ximage.depth = M_BITMAPHANDLERDATA->m_depth; - ximage.bitmap = (void *)M_BITMAPHANDLERDATA->m_hBitmap; - int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name, - &ximage, (XImage *) NULL, (XpmAttributes *) NULL); +wxMask::wxMask( const wxMemoryBuffer& data, int width , int height , int bytesPerRow ) +{ + Init() ; + Create( data, width , height , bytesPerRow ); +} - if (dc) - DeleteDC(dc); +wxMask::~wxMask() +{ + if ( m_maskBitmap ) + { + CGContextRelease( (CGContextRef) m_maskBitmap ); + m_maskBitmap = NULL ; + } +} - if (errorStatus == XpmSuccess) - return TRUE; /* no error */ - else - return FALSE; - } else return FALSE; - } else return FALSE; -#else - return FALSE; -#endif +void wxMask::Init() +{ + m_width = m_height = m_bytesPerRow = 0 ; + m_maskBitmap = NULL ; } +void *wxMask::GetRawAccess() const +{ + return m_memBuf.GetData() ; +} + +// The default ColorTable for k8IndexedGrayPixelFormat in Intel appears to be broken, so we'll use an non-indexed +// bitmap mask instead; in order to keep the code simple, the change applies to PowerPC implementations as well -class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler +void wxMask::RealizeNative() { - DECLARE_DYNAMIC_CLASS(wxXPMDataHandler) -public: - inline wxXPMDataHandler(void) - { - m_name = "XPM bitmap data"; - m_extension = "xpm"; - m_type = wxBITMAP_TYPE_XPM_DATA; - }; - - virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); -}; -IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) - -bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth) -{ - XImage * ximage; - int ErrorStatus; - XpmAttributes xpmAttr; - - xpmAttr.valuemask = XpmReturnInfos; // get infos back - ErrorStatus = XpmCreateImageFromData( GetMainDevice() , (char **)data, - &ximage, (XImage **) NULL, &xpmAttr); - - if (ErrorStatus == XpmSuccess) - { - M_BITMAPHANDLERDATA->m_ok = FALSE; - M_BITMAPHANDLERDATA->m_numColors = 0; - M_BITMAPHANDLERDATA->m_hBitmap = ximage->gworldptr ; - - M_BITMAPHANDLERDATA->m_width = ximage->width; - M_BITMAPHANDLERDATA->m_height = ximage->height; - M_BITMAPHANDLERDATA->m_depth = ximage->depth; - M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels; - XpmFreeAttributes(&xpmAttr); - M_BITMAPHANDLERDATA->m_ok = TRUE; - ximage->gworldptr = NULL ; - XImageFree(ximage); // releases the malloc, but does not detroy - // the bitmap - M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeGrafWorld ; - - return TRUE; - } - else + if ( m_maskBitmap ) { - M_BITMAPHANDLERDATA->m_ok = FALSE; - return FALSE; + CGContextRelease( (CGContextRef) m_maskBitmap ); + m_maskBitmap = NULL ; } - return FALSE; + + CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceGray(); + // from MouseTracking sample : + // Ironically, due to a bug in CGImageCreateWithMask, you cannot use + // CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) at this point! + + m_maskBitmap = CGBitmapContextCreate((char*) m_memBuf.GetData(), m_width, m_height, 8, m_bytesPerRow, colorspace, + kCGImageAlphaNone ); + CGColorSpaceRelease( colorspace ); + wxASSERT_MSG( m_maskBitmap , wxT("Unable to create CGBitmapContext context") ) ; } -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler +// Create a mask from a mono bitmap (copies the bitmap). + +bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow) { - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -public: - inline wxBMPResourceHandler() + m_memBuf = data ; + m_width = width ; + m_height = height ; + m_bytesPerRow = bytesPerRow ; + + wxASSERT( data.GetDataLen() == (size_t)(height * bytesPerRow) ) ; + + RealizeNative() ; + + return true ; +} + +// Create a mask from a mono bitmap (copies the bitmap). +bool wxMask::Create(const wxBitmap& bitmap) +{ + m_width = bitmap.GetWidth() ; + m_height = bitmap.GetHeight() ; + m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ; + + 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 ) { - m_name = "Windows bitmap resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_BMP_RESOURCE; - }; + unsigned char *destdata = destdatabase ; + unsigned char r, g, b; + + for ( int x = 0 ; x < m_width ; ++x ) + { + srcdata++ ; + r = *srcdata++ ; + g = *srcdata++ ; + b = *srcdata++ ; + + if ( ( r + g + b ) > 0x10 ) + *destdata++ = 0xFF ; + else + *destdata++ = 0x00 ; + } + } - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); -}; + m_memBuf.UngetWriteBuf( size ) ; + RealizeNative() ; -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) + return true; +} -bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +// Create a mask from a bitmap and a colour indicating +// the transparent area +bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { - // TODO: load colourmap. -/* - M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name); - if (M_BITMAPHANDLERDATA->m_hBitmap) + m_width = bitmap.GetWidth() ; + m_height = bitmap.GetHeight() ; + m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ; + + 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 * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ; + size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow(); + + for ( int y = 0 ; y < m_height ; ++y , srcdatabase+= sourceBytesRow, destdatabase += m_bytesPerRow) { - M_BITMAPHANDLERDATA->m_ok = TRUE; - BITMAP bm; - GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm); - M_BITMAPHANDLERDATA->m_width = bm.bmWidth; - M_BITMAPHANDLERDATA->m_height = bm.bmHeight; - M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel; - return TRUE; + unsigned char *srcdata = srcdatabase ; + unsigned char *destdata = destdatabase ; + unsigned char r, g, b; + + for ( int x = 0 ; x < m_width ; ++x ) + { + srcdata++ ; + r = *srcdata++ ; + g = *srcdata++ ; + b = *srcdata++ ; + + if ( colour == wxColour( r , g , b ) ) + *destdata++ = 0xFF ; + else + *destdata++ = 0x00 ; + } } -*/ - // it's probably not found - wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str()); - return FALSE; + m_memBuf.UngetWriteBuf( size ) ; + RealizeNative() ; + + return true; } -class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler +WXHBITMAP wxMask::GetHBITMAP() const { - DECLARE_DYNAMIC_CLASS(wxBMPFileHandler) + return m_maskBitmap ; +} + +// ---------------------------------------------------------------------------- +// wxBitmapHandler +// ---------------------------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) + +// ---------------------------------------------------------------------------- +// Standard Handlers +// ---------------------------------------------------------------------------- + +#ifndef __LP64__ + +class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler +{ + DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler) + public: - inline wxBMPFileHandler(void) - { - m_name = "Windows bitmap file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_BMP; - }; - - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); + inline wxPICTResourceHandler() + { + SetName(wxT("Macintosh Pict resource")); + SetExtension(wxEmptyString); + SetType(wxBITMAP_TYPE_PICT_RESOURCE); + }; + + virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, + int desiredWidth, int desiredHeight); }; -IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) +IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler) -bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) + +bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, + const wxString& name, + long WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) { -#if USE_IMAGE_LOADING_IN_MSW - wxPalette *palette = NULL; - bool success = FALSE; -/* - if (type & wxBITMAP_DISCARD_COLOURMAP) - success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap); - else -*/ - success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0); - if (!success && palette) +#if wxUSE_METAFILE + Str255 theName ; + wxMacStringToPascal( name , theName ) ; + + PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ; + if ( thePict ) { - delete palette; - palette = NULL; + wxMetafile mf ; + + mf.SetPICT( thePict ) ; + bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ; + wxMemoryDC dc ; + dc.SelectObject( *bitmap ) ; + mf.Play( &dc ) ; + dc.SelectObject( wxNullBitmap ) ; + + return true ; } - if (palette) - M_BITMAPHANDLERDATA->m_bitmapPalette = *palette; - return success; -#else - return FALSE; #endif + + return false ; } +#endif -bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) +void wxBitmap::InitStandardHandlers() { -#if USE_IMAGE_LOADING_IN_MSW - wxPalette *actualPalette = (wxPalette *)pal; - if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull())) - actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette); - return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0); -#else - return FALSE; +#ifndef __LP64__ + AddHandler( new wxPICTResourceHandler ) ; #endif + AddHandler( new wxICONResourceHandler ) ; } +// ---------------------------------------------------------------------------- +// raw bitmap access support +// ---------------------------------------------------------------------------- + +void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp)) +{ + if ( !Ok() ) + // no bitmap, no data (raw or otherwise) + return NULL; + + data.m_width = GetWidth() ; + data.m_height = GetHeight() ; + data.m_stride = GetBitmapData()->GetBytesPerRow() ; + return BeginRawAccess() ; +} -void wxBitmap::CleanUpHandlers() +void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(dataBase)) { - wxNode *node = sm_handlers.First(); - while ( node ) - { - wxBitmapHandler *handler = (wxBitmapHandler *)node->Data(); - wxNode *next = node->Next(); - delete handler; - delete node; - node = next; - } + EndRawAccess() ; } -void wxBitmap::InitStandardHandlers() +void wxBitmap::UseAlpha() { - AddHandler( new wxPICTResourceHandler ) ; - AddHandler( new wxICONResourceHandler ) ; - AddHandler(new wxXPMFileHandler); - AddHandler(new wxXPMDataHandler); - AddHandler(new wxBMPResourceHandler); - AddHandler(new wxBMPFileHandler); + // remember that we are using alpha channel: + // we'll need to create a proper mask in UngetRawData() + M_BITMAPDATA->UseAlpha( true ); }