/////////////////////////////////////////////////////////////////////////////
-// 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/defs.h"
+#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"
+#include "wx/rawbmp.h"
+
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject )
#ifdef __DARWIN__
#include <ApplicationServices/ApplicationServices.h>
#include "wx/mac/uma.h"
-CTabHandle wxMacCreateColorTable( int numColors )
+// 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
+
+// we don't dare use premultiplied alpha yet
+#define wxMAC_USE_PREMULTIPLIED_ALPHA 0
+
+#if wxUSE_BMPBUTTON
+
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
{
- CTabHandle newColors; /* Handle to the new color table */
-
- /* Allocate memory for the color table */
- newColors = (CTabHandle)NewHandleClear( sizeof (ColorTable) +
- sizeof (ColorSpec) * (numColors - 1) );
- if (newColors != nil)
+ memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
+ if ( bitmap.Ok() )
{
- /* Initialize the fields */
- (**newColors).ctSeed = GetCTSeed();
- (**newColors).ctFlags = 0;
- (**newColors).ctSize = numColors - 1;
- /* Initialize the table of colors */
+ wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
+ if ( bmap == NULL )
+ return ;
+
+ if ( ( bmap->HasNativeSize() && forceType == 0 ) || 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 ) ;
+ }
+#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ else if ( forceType == kControlContentCGImageRef )
+ {
+ info->contentType = kControlContentCGImageRef ;
+ info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ;
+ }
+#endif
+ else
+ {
+#ifndef __LP64__
+ info->contentType = kControlContentPictHandle ;
+ info->u.picture = bmap->GetPictHandle() ;
+#endif
+ }
}
- return newColors ;
}
-void wxMacDestroyColorTable( CTabHandle colors )
+void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
{
- DisposeHandle( (Handle) colors ) ;
+ 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
+ }
+#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 ) ;
+ }
+#endif
+ else
+ {
+ wxFAIL_MSG(wxT("Unexpected bitmap type") ) ;
+ }
}
-void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue )
+#endif //wxUSE_BMPBUTTON
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
+
+void wxBitmapRefData::Init()
{
- (**newColors).ctTable[index].value = index;
- (**newColors).ctTable[index].rgb.red = red ;// someRedValue;
- (**newColors).ctTable[index].rgb.green = green ; // someGreenValue;
- (**newColors).ctTable[index].rgb.blue = blue ; // someBlueValue;
+ m_width = 0 ;
+ m_height = 0 ;
+ 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 ;
+ m_hMaskBitmap = NULL;
+ m_maskBytesPerRow = 0 ;
+
+ m_rawAccessCount = 0 ;
+ m_hasAlpha = false;
}
-GWorldPtr wxMacCreateGWorld( int width , int height , int depth )
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
{
- OSErr err = noErr ;
- GWorldPtr port ;
- Rect rect = { 0 , 0 , height , width } ;
+ Init();
+ Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth);
- if ( depth < 0 )
+ 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; i<numbytes; i++)
{
- depth = wxDisplayDepth() ;
+ *dest++ = *source++;
}
-
- err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ;
- if ( err == noErr )
+
+ UseAlpha(tocopy.m_hasAlpha);
+
+ // TODO: Copy palette?
+}
+
+wxBitmapRefData::wxBitmapRefData()
+{
+ Init() ;
+}
+
+wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
+{
+ Init() ;
+ Create( w , h , d ) ;
+}
+
+bool wxBitmapRefData::Create( int w , int h , int d )
+{
+ m_width = wxMax(1, w);
+ m_height = wxMax(1, h);
+ m_depth = d ;
+
+ m_bytesPerRow = 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 ;
+ Rect rect = { 0 , 0 , m_height , m_width } ;
+#ifndef __LP64__
+ verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
+ (char*) data , m_bytesPerRow ) ) ;
+ wxASSERT_MSG( m_hBitmap , wxT("Unable to create GWorld context") ) ;
+#endif
+ m_ok = ( m_hBitmap != NULL ) ;
+
+ return m_ok ;
+}
+
+void wxBitmapRefData::UseAlpha( bool use )
+{
+ if ( m_hasAlpha == use )
+ return ;
+
+ m_hasAlpha = use ;
+ if ( m_hasAlpha )
{
- return port ;
+ wxASSERT( m_hMaskBitmap == NULL ) ;
+
+ int width = GetWidth() ;
+ int height = GetHeight() ;
+ m_maskBytesPerRow = ( width * 4 + 3 ) & 0xFFFFFFC ;
+ size_t size = height * m_maskBytesPerRow ;
+ unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ;
+ wxASSERT( data != NULL ) ;
+
+ memset( data , 0 , size ) ;
+ Rect rect = { 0 , 0 , height , width } ;
+#ifndef __LP64__
+ verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
+ (char*) data , m_maskBytesPerRow ) ) ;
+ wxASSERT_MSG( m_hMaskBitmap , wxT("Unable to create GWorld context for alpha mask") ) ;
+#endif
+ m_maskMemBuf.UngetWriteBuf(size) ;
+
+#if !wxMAC_USE_CORE_GRAPHICS
+ UpdateAlphaMask() ;
+#endif
}
- return NULL ;
+ else
+ {
+#ifndef __LP64__
+ DisposeGWorld( m_hMaskBitmap ) ;
+#endif
+ m_hMaskBitmap = NULL ;
+ m_maskBytesPerRow = 0 ;
+ }
+}
+
+void *wxBitmapRefData::GetRawAccess() const
+{
+ wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+ return m_memBuf.GetData() ;
+}
+
+void *wxBitmapRefData::BeginRawAccess()
+{
+ wxCHECK_MSG( Ok(), 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 ;
+
+#ifdef __WXMAC_OSX__
+ // we must destroy an existing cached image, as
+ // the bitmap data may change now
+ if ( m_cgImageRef )
+ {
+ CGImageRelease( m_cgImageRef ) ;
+ m_cgImageRef = NULL ;
+ }
+#endif
+
+ return m_memBuf.GetData() ;
}
-void wxMacDestroyGWorld( GWorldPtr gw )
+void wxBitmapRefData::EndRawAccess()
{
- if ( gw )
- DisposeGWorld( gw ) ;
+ wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+ wxASSERT( m_rawAccessCount == 1 ) ;
+
+ --m_rawAccessCount ;
+
+#if !wxMAC_USE_CORE_GRAPHICS
+ UpdateAlphaMask() ;
+#endif
}
-#define kDefaultRes 0x00480000 /* Default resolution is 72 DPI; Fixed type */
+bool wxBitmapRefData::HasNativeSize()
+{
+ int w = GetWidth() ;
+ int h = GetHeight() ;
+ int sz = wxMax( w , h ) ;
+
+ return ( sz == 128 || sz == 48 || sz == 32 || sz == 16 );
+}
-OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect *bounds , CTabHandle colors )
+IconRef wxBitmapRefData::GetIconRef()
{
- CTabHandle newColors; /* Color table used for the off-screen PixMap */
- Ptr offBaseAddr; /* Pointer to the off-screen pixel image */
- OSErr error; /* Returns error code */
- short bytesPerRow; /* Number of bytes per row in the PixMap */
+ if ( m_iconRef == NULL )
+ {
+ // Create Icon Family Handle
+ IconFamilyHandle iconFamily = NULL ;
- error = noErr;
- newColors = nil;
- offBaseAddr = nil;
+#ifdef WORDS_BIGENDIAN
+ iconFamily = (IconFamilyHandle) NewHandle( 8 ) ;
+ (**iconFamily).resourceType = kIconFamilyType ;
+ (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
+#else
+ // test this solution on big endian as well
+ iconFamily = (IconFamilyHandle) NewHandle( 0 ) ;
+#endif
- bytesPerRow = ((depth * (bounds->right - bounds->left) + 31) / 32) * 4;
+ int w = GetWidth() ;
+ int h = GetHeight() ;
+ int sz = wxMax( w , h ) ;
- /* Clone the clut if indexed color; allocate a dummy clut if direct color*/
- if (depth <= 8)
- {
- newColors = colors;
- error = HandToHand((Handle *) &newColors);
- }
- else
+ OSType dataType = 0 ;
+ OSType maskType = 0 ;
+
+ switch (sz)
{
- newColors = (CTabHandle) NewHandle(sizeof(ColorTable) -
- sizeof(CSpecArray));
- error = MemError();
+ case 128:
+ dataType = kThumbnail32BitData ;
+ maskType = kThumbnail8BitMask ;
+ break;
+
+ case 48:
+ dataType = kHuge32BitData ;
+ maskType = kHuge8BitMask ;
+ break;
+
+ case 32:
+ dataType = kLarge32BitData ;
+ maskType = kLarge8BitMask ;
+ break;
+
+ case 16:
+ dataType = kSmall32BitData ;
+ maskType = kSmall8BitMask ;
+ break;
+
+ default:
+ break;
}
- if (error == noErr)
+
+ if ( dataType != 0 )
{
- /* Allocate pixel image; long integer multiplication avoids overflow */
- (**icon).iconData = NewHandle((unsigned long) bytesPerRow * (bounds->bottom -
- bounds->top));
- if ((**icon).iconData != nil)
+ // 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 * source = (unsigned char*) GetRawAccess() ;
+ unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
+
+ for ( int y = 0 ; y < h ; ++y )
{
- /* Initialize fields common to indexed and direct PixMaps */
- (**icon).iconPMap.baseAddr = 0; /* Point to image */
- (**icon).iconPMap.rowBytes = bytesPerRow | /* MSB set for PixMap */
- 0x8000;
- (**icon).iconPMap.bounds = *bounds; /* Use given bounds */
- (**icon).iconPMap.pmVersion = 0; /* No special stuff */
- (**icon).iconPMap.packType = 0; /* Default PICT pack */
- (**icon).iconPMap.packSize = 0; /* Always zero in mem */
- (**icon).iconPMap.hRes = kDefaultRes; /* 72 DPI default res */
- (**icon).iconPMap.vRes = kDefaultRes; /* 72 DPI default res */
- (**icon).iconPMap.pixelSize = depth; /* Set # bits/pixel */
-
- /* Initialize fields specific to indexed and direct PixMaps */
- if (depth <= 8)
- {
- /* PixMap is indexed */
- (**icon).iconPMap.pixelType = 0; /* Indicates indexed */
- (**icon).iconPMap.cmpCount = 1; /* Have 1 component */
- (**icon).iconPMap.cmpSize = depth; /* Component size=depth */
- (**icon).iconPMap.pmTable = newColors; /* Handle to CLUT */
- }
- else
+ 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 )
{
- /* PixMap is direct */
- (**icon).iconPMap.pixelType = RGBDirect; /* Indicates direct */
- (**icon).iconPMap.cmpCount = 3; /* Have 3 components */
- if (depth == 16)
- (**icon).iconPMap.cmpSize = 5; /* 5 bits/component */
- else
- (**icon).iconPMap.cmpSize = 8; /* 8 bits/component */
- (**newColors).ctSeed = 3 * (**icon).iconPMap.cmpSize;
- (**newColors).ctFlags = 0;
- (**newColors).ctSize = 0;
- (**icon).iconPMap.pmTable = newColors;
+ a = *source ++ ;
+ r = *source ++ ;
+ g = *source ++ ;
+ b = *source ++ ;
+
+ *dest++ = 0 ;
+ *dest++ = r ;
+ *dest++ = g ;
+ *dest++ = b ;
+
+ if ( mask )
+ {
+ *maskdest++ = 0xFF - *masksource++ ;
+ masksource++ ;
+ masksource++ ;
+ masksource++ ;
+ }
+ else if ( hasAlpha )
+ *maskdest++ = a ;
+ else
+ *maskdest++ = 0xFF ;
}
}
- else
- error = MemError();
- }
- else
- newColors = nil;
- /* If no errors occured, return a handle to the new off-screen PixMap */
- if (error != noErr)
+ 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
{
- if (newColors != nil)
- DisposeCTable(newColors);
+ 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 ;
+
+ 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 ) ;
+ ++iconCounter ;
+#endif
+ DisposeHandle( (Handle) iconFamily ) ;
+ }
- /* Return the error code */
- return error;
+ return m_iconRef ;
}
-CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize )
+PicHandle wxBitmapRefData::GetPictHandle()
{
- GWorldPtr saveWorld;
- GDHandle saveHandle;
+ if ( m_pictHandle == NULL )
+ {
+#ifndef __LP64__
+ CGrafPtr origPort = NULL ;
+ GDHandle origDev = NULL ;
+ GWorldPtr wp = NULL ;
+ GWorldPtr mask = NULL ;
+ int height = GetHeight() ;
+ int width = GetWidth() ;
- GetGWorld(&saveWorld,&saveHandle); // save Graphics env state
- SetGWorld(image,nil);
+ Rect rect = { 0 , 0 , height , width } ;
+ RgnHandle clipRgn = NULL ;
- Rect frame = { 0 , 0 , iconSize , iconSize } ;
- Rect imageBounds = frame ;
- GetPortBounds( image , &imageBounds ) ;
+ GetGWorld( &origPort , &origDev ) ;
+ wp = GetHBITMAP( &mask ) ;
- int bwSize = iconSize / 8 * iconSize ;
- CIconHandle icon = (CIconHandle) NewHandleClear( sizeof ( CIcon ) + 2 * bwSize) ;
- HLock((Handle)icon) ;
- SetupCIconHandlePixMap( icon , dstDepth , &frame,GetCTable(dstDepth)) ;
- HLock( (**icon).iconData ) ;
- (**icon).iconPMap.baseAddr = *(**icon).iconData ;
+ if ( mask )
+ {
+ GWorldPtr monoworld ;
+ clipRgn = NewRgn() ;
+ OSStatus err = NewGWorld( &monoworld , 1 , &rect , NULL , NULL , 0 ) ;
+ verify_noerr(err) ;
+ LockPixels( GetGWorldPixMap( monoworld ) ) ;
+ LockPixels( GetGWorldPixMap( mask ) ) ;
+ SetGWorld( monoworld , NULL ) ;
+
+ RGBColor white = { 0xffff , 0xffff , 0xffff } ;
+ RGBColor black = { 0x0000 , 0x0000 , 0x0000 } ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+
+ CopyBits(GetPortBitMapForCopyBits(mask),
+ GetPortBitMapForCopyBits(monoworld),
+ &rect,
+ &rect,
+ srcCopy, NULL);
+ BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( monoworld ) ) ;
+
+ UnlockPixels( GetGWorldPixMap( monoworld ) ) ;
+ UnlockPixels( GetGWorldPixMap( mask ) ) ;
+ DisposeGWorld( monoworld ) ;
+ }
- LockPixels(GetGWorldPixMap(image));
-
- CopyBits(GetPortBitMapForCopyBits(image),
- (BitMapPtr)&((**icon).iconPMap),
- &imageBounds,
- &imageBounds,
- srcCopy | ditherCopy, nil);
-
-
- UnlockPixels(GetGWorldPixMap(image));
- HUnlock( (**icon).iconData ) ;
-
- (**icon).iconMask.rowBytes = iconSize / 8 ;
- (**icon).iconMask.bounds = frame ;
+ SetGWorld( wp , NULL ) ;
+ Rect portRect ;
+ GetPortBounds( wp , &portRect ) ;
+ m_pictHandle = OpenPicture(&portRect);
- (**icon).iconBMap.rowBytes = iconSize / 8 ;
- (**icon).iconBMap.bounds = frame ;
- (**icon).iconMask.baseAddr = (char*) &(**icon).iconMaskData ;
- (**icon).iconBMap.baseAddr = (char*) &(**icon).iconMaskData + bwSize ;
+ if (m_pictHandle)
+ {
+ RGBColor white = { 0xffff , 0xffff , 0xffff } ;
+ RGBColor black = { 0x0000 , 0x0000 , 0x0000 } ;
+
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+
+ if ( clipRgn )
+ SetClip( clipRgn ) ;
+
+ LockPixels( GetGWorldPixMap( wp ) ) ;
+ CopyBits(GetPortBitMapForCopyBits(wp),
+ GetPortBitMapForCopyBits(wp),
+ &portRect,
+ &portRect,
+ srcCopy,clipRgn);
+ UnlockPixels( GetGWorldPixMap( wp ) ) ;
+ ClosePicture();
+ }
- if ( mask )
- {
- LockPixels(GetGWorldPixMap(mask) ) ;
- CopyBits(GetPortBitMapForCopyBits(mask) ,
- &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
- CopyBits(GetPortBitMapForCopyBits(mask) ,
- &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
- UnlockPixels(GetGWorldPixMap( mask ) ) ;
- }
- else
- {
- LockPixels(GetGWorldPixMap(image));
- CopyBits(GetPortBitMapForCopyBits(image) ,
- &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
- CopyBits(GetPortBitMapForCopyBits(image) ,
- &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
- UnlockPixels(GetGWorldPixMap(image));
+ SetGWorld( origPort , origDev ) ;
+ if ( clipRgn )
+ DisposeRgn( clipRgn ) ;
+#endif
}
-
- (**icon).iconMask.baseAddr = NULL ;
- (**icon).iconBMap.baseAddr = NULL ;
- (**icon).iconPMap.baseAddr = NULL ;
- HUnlock((Handle)icon) ;
- SetGWorld(saveWorld,saveHandle);
-
- return icon;
+
+ return m_pictHandle ;
}
-PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
+#ifdef __WXMAC_OSX__
+void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size)
{
- CGrafPtr origPort ;
- GDHandle origDev ;
+ wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
- PicHandle pict;
+ wxASSERT( data == membuf->GetData() ) ;
- RGBColor white = { 0xffff ,0xffff , 0xffff } ;
- RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ;
-
- GetGWorld( &origPort , &origDev ) ;
-
- RgnHandle clipRgn = NULL ;
+ delete membuf ;
+}
- if ( mask )
- {
- clipRgn = NewRgn() ;
- LockPixels( GetGWorldPixMap( mask ) ) ;
- BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( mask ) ) ;
- UnlockPixels( GetGWorldPixMap( mask ) ) ;
- }
-
- SetGWorld( wp , NULL ) ;
- Rect portRect ;
- GetPortBounds( wp , &portRect ) ;
-
- pict = OpenPicture(&portRect);
- if(pict)
- {
- RGBForeColor( &black ) ;
- RGBBackColor( &white ) ;
-
- LockPixels( GetGWorldPixMap( wp ) ) ;
- CopyBits(GetPortBitMapForCopyBits(wp),
- GetPortBitMapForCopyBits(wp),
- &portRect,
- &portRect,
- srcCopy,clipRgn);
- UnlockPixels( GetGWorldPixMap( wp ) ) ;
- ClosePicture();
- }
- SetGWorld( origPort , origDev ) ;
- return pict;
-}
-
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap )
+CGImageRef wxBitmapRefData::CGImageCreate() const
{
- memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
- if ( bitmap.Ok() )
+ wxASSERT( m_ok ) ;
+ wxASSERT( m_rawAccessCount >= 0 ) ;
+ CGImageRef image ;
+ if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
- if ( bmap == NULL )
- return ;
-
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
+ size_t imageSize = m_width * m_height * 4 ;
+ void * dataBuffer = m_memBuf.GetData() ;
+ int w = m_width ;
+ int h = m_height ;
+ CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ;
+ wxMemoryBuffer* membuf = NULL ;
+
+ if ( m_bitmapMask )
{
- info->contentType = kControlContentPictHandle ;
- info->u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( (bmap->m_width == bmap->m_height) && (bmap->m_width & 0x3 == 0) )
+ 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() ;
+ for ( int y = 0 ; y < h ; ++y , sourcemaskstart += maskrowbytes)
{
- info->contentType = kControlContentCIconHandle ;
- if ( bitmap.GetMask() )
+ unsigned char *sourcemask = sourcemaskstart ;
+ for ( int x = 0 ; x < w ; ++x , sourcemask += 4 , destalpha += 4 )
{
- info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
- 8 , bmap->m_width ) ;
- }
- else
- {
- info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
- 8 , bmap->m_width ) ;
+ *destalpha = 0xFF - *sourcemask ;
}
}
- else
+ }
+ else
+ {
+ if ( m_hasAlpha )
{
- info->contentType = kControlContentPictHandle ;
- if ( bitmap.GetMask() )
- {
- info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap() ) ) ;
- }
- else
- {
- info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ) ;
- }
+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+ alphaInfo = kCGImageAlphaPremultipliedFirst ;
+#else
+ alphaInfo = kCGImageAlphaFirst ;
+#endif
}
+
+ membuf = new wxMemoryBuffer( m_memBuf ) ;
+ }
+
+ CGDataProviderRef dataProvider = NULL ;
+ if ( m_depth == 1 )
+ {
+ 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 );
+ }
+ 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 );
}
- else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
- {
- info->contentType = kControlContentCIconHandle ;
- info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
- }
+ 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 ;
}
+#endif
-wxBitmapRefData::wxBitmapRefData()
+GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
{
- 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_hIcon = NULL ;
- m_bitmapType = kMacBitmapTypeUnknownType ;
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+ if ( mask )
+ {
+ *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 something
+ // is really accessing the GrafPorts, we have to sync it
+ UpdateAlphaMask() ;
+#endif
+
+ *mask = m_hMaskBitmap ;
+ }
+ }
+
+ return m_hBitmap ;
}
-// TODO move this do a public function of Bitmap Ref
-static void DisposeBitmapRefData(wxBitmapRefData *data)
+void wxBitmapRefData::UpdateAlphaMask() const
{
- switch (data->m_bitmapType)
+ if ( m_hasAlpha )
{
- case kMacBitmapTypePict :
- {
- if ( data->m_hPict )
- {
- KillPicture( MAC_WXHMETAFILE( data->m_hPict ) ) ;
- data->m_hPict = NULL ;
- }
- }
- break ;
- case kMacBitmapTypeGrafWorld :
- {
- if ( data->m_hBitmap )
- {
- wxMacDestroyGWorld( MAC_WXHBITMAP(data->m_hBitmap) ) ;
- data->m_hBitmap = NULL ;
- }
- }
- break ;
- case kMacBitmapTypeIcon :
- if ( data->m_hIcon )
+ unsigned char *sourcemask = (unsigned char *) GetRawAccess() ;
+ unsigned char *destalphabase = (unsigned char *) m_maskMemBuf.GetData() ;
+
+ int h = GetHeight() ;
+ int w = GetWidth() ;
+
+ for ( int y = 0 ; y < h ; ++y , destalphabase += m_maskBytesPerRow )
+ {
+ unsigned char* destalpha = destalphabase ;
+
+ for ( int x = 0 ; x < w ; ++x , sourcemask += 4 )
{
- DisposeCIcon( MAC_WXHICON(data->m_hIcon) ) ;
- data->m_hIcon = NULL ;
+ // we must have 24 bit depth for non quartz smooth alpha
+ *destalpha++ = 255 ;
+ *destalpha++ = 255 - *sourcemask ;
+ *destalpha++ = 255 - *sourcemask ;
+ *destalpha++ = 255 - *sourcemask ;
}
-
- default :
- // unkown type ?
- break ;
+ }
+ }
+}
+
+void wxBitmapRefData::Free()
+{
+ wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
+
+#ifdef __WXMAC_OSX__
+ if ( m_cgImageRef )
+ {
+ CGImageRelease( m_cgImageRef ) ;
+ 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;
+ m_bitmapMask = NULL;
}
-
- if (data->m_bitmapMask)
- {
- delete data->m_bitmapMask;
- data->m_bitmapMask = NULL;
- }
}
wxBitmapRefData::~wxBitmapRefData()
{
- DisposeBitmapRefData( this ) ;
+ Free() ;
}
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
- Ref(icon) ;
+ bool created = false ;
+ int w = icon.GetWidth() ;
+ int h = icon.GetHeight() ;
+
+ Create( icon.GetWidth() , icon.GetHeight() ) ;
+
+ 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 )
+ {
+ *destination++ = *sourcemask++ ;
+ source++ ;
+ *destination++ = *source++ ;
+ *destination++ = *source++ ;
+ *destination++ = *source++ ;
+ }
+ }
+
+ EndRawAccess() ;
+ DisposeHandle( imagehandle ) ;
+ DisposeHandle( maskhandle ) ;
+ created = true ;
+ }
+
+ DisposeHandle( (Handle) iconFamily ) ;
+ }
+
+ if ( !created )
+ {
+ wxMemoryDC dc ;
+ dc.SelectObject( *this ) ;
+ dc.DrawIcon( icon , 0 , 0 ) ;
+ dc.SelectObject( wxNullBitmap ) ;
+ }
+
return true;
}
wxBitmap::wxBitmap()
{
- m_refData = NULL;
}
wxBitmap::~wxBitmap()
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
{
- m_refData = new wxBitmapRefData;
+ m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
- 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 ;
- MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
- M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;
-
- CGrafPtr origPort ;
- GDHandle origDevice ;
-
- GetGWorld( &origPort , &origDevice ) ;
- SetGWorld( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) , NULL ) ;
- LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
-
- // bits is a char array
-
- unsigned char* linestart = (unsigned char*) bits ;
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);
- }
-
- RGBColor colors[2] = {
- { 0xFFFF , 0xFFFF , 0xFFFF } ,
- { 0, 0 , 0 }
- } ;
-
+
+ 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 )
{
- SetCPixel( x , y , &colors[1] ) ;
+ *destination++ = 0xFF ;
+ *destination++ = 0 ;
+ *destination++ = 0 ;
+ *destination++ = 0 ;
}
else
{
- SetCPixel( x , y , &colors[0] ) ;
+ *destination++ = 0xFF ;
+ *destination++ = 0xFF ;
+ *destination++ = 0xFF ;
+ *destination++ = 0xFF ;
}
}
}
- UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
-
- SetGWorld( origPort , origDevice ) ;
+
+ EndRawAccess() ;
}
else
{
(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);
}
LoadFile(filename, type);
}
-bool wxBitmap::CreateFromXpm(const char **bits)
+wxObjectRefData* wxBitmap::CreateRefData() const
+{
+ return new wxBitmapRefData;
+}
+
+wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
+{
+ return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
+}
+
+void * wxBitmap::GetRawAccess() const
+{
+ wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+
+ return M_BITMAPDATA->GetRawAccess() ;
+}
+
+void * wxBitmap::BeginRawAccess()
{
- 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;
+ wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+
+ return M_BITMAPDATA->BeginRawAccess() ;
}
-wxBitmap::wxBitmap(const char **bits)
+void wxBitmap::EndRawAccess()
{
- (void) CreateFromXpm(bits);
+ wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+
+ M_BITMAPDATA->EndRawAccess() ;
}
-wxBitmap::wxBitmap(char **bits)
+#ifdef __WXMAC_OSX__
+WXCGIMAGEREF wxBitmap::CGImageCreate() const
{
- (void) CreateFromXpm((const char **)bits);
+ wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+
+ return M_BITMAPDATA->CGImageCreate() ;
}
+#endif
wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
{
- wxCHECK_MSG( Ok() &&
+ 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") );
-
- GWorldPtr origPort;
- GDHandle origDevice;
-
- GetGWorld( &origPort, &origDevice );
-
- // Update the subbitmaps reference data
- wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData();
-
- ref->m_numColors = M_BITMAPDATA->m_numColors;
- ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
- ref->m_bitmapType = M_BITMAPDATA->m_bitmapType;
-
- // Copy sub region of this bitmap
- if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict)
- {
- printf("GetSubBitmap: Copy a region of a Pict structure - TODO\n");
- }
- else if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypeGrafWorld)
- {
- // Copy mask
- if(GetMask())
- {
- GWorldPtr submask, mask;
- RGBColor color;
-
- mask = (GWorldPtr) GetMask()->GetMaskBitmap();
- submask = wxMacCreateGWorld(rect.width, rect.height, 1);
- LockPixels(GetGWorldPixMap(mask));
- LockPixels(GetGWorldPixMap(submask));
-
- for(int yy = 0; yy < rect.height; yy++)
- {
- for(int xx = 0; xx < rect.width; xx++)
- {
- SetGWorld(mask, NULL);
- GetCPixel(rect.x + xx, rect.y + yy, &color);
- SetGWorld(submask, NULL);
- SetCPixel(xx,yy, &color);
- }
- }
- UnlockPixels(GetGWorldPixMap(mask));
- UnlockPixels(GetGWorldPixMap(submask));
- ref->m_bitmapMask = new wxMask;
- ref->m_bitmapMask->SetMaskBitmap(submask);
- }
-
- // Copy bitmap
- if(GetHBITMAP())
- {
- GWorldPtr subbitmap, bitmap;
- RGBColor color;
-
- bitmap = (GWorldPtr) GetHBITMAP();
- subbitmap = (GWorldPtr) ref->m_hBitmap ;
- LockPixels(GetGWorldPixMap(bitmap));
- LockPixels(GetGWorldPixMap(subbitmap));
-
- for(int yy = 0; yy < rect.height; yy++)
- {
- for(int xx = 0; xx < rect.width; xx++)
- {
- SetGWorld(bitmap, NULL);
- GetCPixel(rect.x + xx, rect.y + yy, &color);
- SetGWorld(subbitmap, NULL);
- SetCPixel(xx, yy, &color);
- }
- }
- UnlockPixels(GetGWorldPixMap(bitmap));
- UnlockPixels(GetGWorldPixMap(subbitmap));
- }
- }
- SetGWorld( origPort, origDevice );
-
- return ret;
-}
+ wxBitmap ret( rect.width, rect.height, GetDepth() );
+ wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
-bool wxBitmap::Create(int w, int h, int d)
-{
- UnRef();
+ int sourcewidth = GetWidth() ;
+ int destwidth = rect.width ;
+ int destheight = rect.height ;
- m_refData = new wxBitmapRefData;
+ {
+ unsigned char *sourcedata = (unsigned char*) GetRawAccess() ;
+ unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
+ wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
- M_BITMAPDATA->m_width = w;
- M_BITMAPDATA->m_height = h;
- M_BITMAPDATA->m_depth = d;
+ int sourcelinesize = sourcewidth * 4 ;
+ int destlinesize = destwidth * 4 ;
+ unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ;
+ unsigned char *dest = destdata ;
- 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;
-}
+ for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+ {
+ memcpy( dest , source , destlinesize ) ;
+ }
+ }
-int wxBitmap::GetBitmapType() const
-{
- wxCHECK_MSG( Ok(), kMacBitmapTypeUnknownType, wxT("invalid bitmap") );
+ ret.EndRawAccess() ;
+
+ if ( M_BITMAPDATA->m_bitmapMask )
+ {
+ wxMemoryBuffer maskbuf ;
+ int rowBytes = ( destwidth * 4 + 3 ) & 0xFFFFFFC ;
+ size_t maskbufsize = rowBytes * destheight ;
+
+ int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ;
+ int destlinesize = rowBytes ;
- return M_BITMAPDATA->m_bitmapType;
+ 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 * 4 + 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;
}
-void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
+bool wxBitmap::Create(int w, int h, int d)
{
- DisposeBitmapRefData( M_BITMAPDATA ) ;
-
- M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
- M_BITMAPDATA->m_hBitmap = bmp ;
- M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hBitmap != NULL ) ;
+ UnRef();
+
+ if ( d < 0 )
+ d = wxDisplayDepth() ;
+
+ m_refData = new wxBitmapRefData( w , h , d );
+
+ return M_BITMAPDATA->Ok() ;
}
bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
}
else
{
+#if wxUSE_IMAGE
wxImage loadimage(filename, type);
- if (loadimage.Ok()) {
+ if (loadimage.Ok())
+ {
*this = loadimage;
+
return true;
}
+#endif
}
- wxLogWarning("no bitmap handler for type %d defined.", type);
+
+ 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();
wxBitmapHandler *handler = FindHandler(type);
- if ( handler == NULL ) {
- wxLogWarning("no bitmap handler for type %d defined.", type);
+ if ( handler == NULL )
+ {
+ wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
- return FALSE;
+ return false;
}
return handler->Create(this, data, type, width, height, depth);
}
+#if wxUSE_IMAGE
+
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
- wxCHECK_RET( image.Ok(), wxT("invalid image") )
- wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") )
+ wxCHECK_RET( image.Ok(), wxT("invalid image") );
- m_refData = new wxBitmapRefData();
-
// 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
- Create( width , height , 32 ) ;
-
- CGrafPtr origPort ;
- GDHandle origDevice ;
+ bool hasAlpha = false ;
- PixMapHandle pixMap = GetGWorldPixMap((GWorldPtr)GetHBITMAP()) ;
- LockPixels( pixMap );
+ if ( image.HasMask() )
+ {
+ // takes precedence, don't mix with alpha info
+ }
+ else
+ {
+ hasAlpha = image.HasAlpha() ;
+ }
- GetGWorld( &origPort , &origDevice ) ;
- SetGWorld( (GWorldPtr) GetHBITMAP() , NULL ) ;
-
- // Render image
- RGBColor colorRGB ;
+ if ( hasAlpha )
+ UseAlpha() ;
+ unsigned char* destination = (unsigned char*) BeginRawAccess() ;
register unsigned char* data = image.GetData();
- char* destinationBase = GetPixBaseAddr( pixMap );
- register unsigned char* destination = (unsigned char*) destinationBase ;
+ const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
+
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
- *destination++ = 0 ;
- *destination++ = *data++ ;
- *destination++ = *data++ ;
- *destination++ = *data++ ;
+ 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++ ;
+ }
}
- destinationBase += ((**pixMap).rowBytes & 0x7fff);
- destination = (unsigned char*) destinationBase ;
- }
- if ( image.HasMask() )
- {
- data = image.GetData();
-
- wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
- RGBColor white = { 0xffff, 0xffff, 0xffff };
- RGBColor black = { 0 , 0 , 0 };
- wxBitmap maskBitmap ;
-
- maskBitmap.Create( width, height, 1);
- LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
- SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);
-
- for (int y = 0; y < height; y++)
- {
- for (int x = 0; x < width; x++)
- {
- if ( data[0] == image.GetMaskRed() && data[1] == image.GetMaskGreen() && data[2] == image.GetMaskBlue() )
- {
- SetCPixel(x,y, &white);
- }
- else {
- SetCPixel(x,y, &black);
- }
- data += 3 ;
- }
- } // for height
- SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
- SetMask(new wxMask( maskBitmap ));
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
}
-
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP()) );
- SetGWorld( origPort, origDevice );
+
+ EndRawAccess() ;
+ if ( image.HasMask() )
+ SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
}
wxImage wxBitmap::ConvertToImage() const
{
wxImage image;
-
+
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
// create an wxImage object
image.Create( width, height );
unsigned char *data = image.GetData();
-
wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
- GWorldPtr origPort;
- GDHandle origDevice;
- int index;
- RGBColor color;
- // background color set to RGB(16,16,16) in consistent with wxGTK
- unsigned char mask_r=16, mask_g=16, mask_b=16;
- SInt16 r,g,b;
- wxMask *mask = GetMask();
-
- GetGWorld( &origPort, &origDevice );
- LockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
- SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
-
- // Copy data into image
- index = 0;
- for (int yy = 0; yy < height; yy++)
+ unsigned char* source = (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 )
+ {
+ 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 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++ , mask += maskBytesPerRow )
{
+ unsigned char * maskp = mask ;
+ unsigned char a, r, g, b;
+ long color;
+
for (int xx = 0; xx < width; xx++)
{
- GetCPixel(xx,yy, &color);
- r = ((color.red ) >> 8);
- g = ((color.green ) >> 8);
- b = ((color.blue ) >> 8);
- data[index ] = r;
- data[index + 1] = g;
- data[index + 2] = b;
- if (mask)
+ 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 (mask->PointMasked(xx,yy))
+ if ( *maskp++ == 0xFF )
{
- data[index ] = mask_r;
- data[index + 1] = mask_g;
- data[index + 2] = mask_b;
+ r = MASK_RED ;
+ g = MASK_GREEN ;
+ b = MASK_BLUE ;
}
+ else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
+ b = MASK_BLUE_REPLACEMENT ;
+
+ maskp++ ;
+ maskp++ ;
+ maskp++ ;
}
+ else if ( hasAlpha )
+ *alpha++ = a ;
+
+ data[index ] = r ;
+ data[index + 1] = g ;
+ data[index + 2] = b ;
+
index += 3;
+ source += 4 ;
}
}
- if (mask)
- {
- image.SetMaskColour( mask_r, mask_g, mask_b );
- image.SetMask( true );
- }
- // Free resources
- UnlockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
- SetGWorld(origPort, origDevice);
+ 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);
if ( handler )
{
- return handler->SaveFile(this, filename, type, palette);
+ success = handler->SaveFile(this, filename, type, palette);
}
else
{
+#if wxUSE_IMAGE
wxImage image = ConvertToImage();
-
- return image.SaveFile(filename, type);
+ success = image.SaveFile(filename, type);
+#else
+ wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+#endif
}
-
- wxLogWarning("no bitmap handler for type %d defined.", type);
- return false;
+
+ return success;
}
-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const
{
- return (M_BITMAPDATA && M_BITMAPDATA->m_ok);
+ return (M_BITMAPDATA && M_BITMAPDATA->Ok());
}
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
- return M_BITMAPDATA->m_height;
+ return M_BITMAPDATA->GetHeight();
}
int wxBitmap::GetWidth() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
- return M_BITMAPDATA->m_width;
+ return M_BITMAPDATA->GetWidth() ;
}
int wxBitmap::GetDepth() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
- return M_BITMAPDATA->m_depth;
-}
-
-int wxBitmap::GetQuality() const
-{
- wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
-
- return M_BITMAPDATA->m_quality;
+ return M_BITMAPDATA->GetDepth();
}
wxMask *wxBitmap::GetMask() const
return M_BITMAPDATA->m_bitmapMask;
}
-void wxBitmap::SetWidth(int w)
+bool wxBitmap::HasAlpha() const
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
+ wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") );
- M_BITMAPDATA->m_width = w;
+ return M_BITMAPDATA->HasAlpha() ;
}
-void wxBitmap::SetHeight(int h)
+void wxBitmap::SetWidth(int w)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
-
- M_BITMAPDATA->m_height = h;
+ AllocExclusive();
+ M_BITMAPDATA->SetWidth(w);
}
-void wxBitmap::SetDepth(int d)
+void wxBitmap::SetHeight(int h)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
-
- M_BITMAPDATA->m_depth = d;
+ AllocExclusive();
+ M_BITMAPDATA->SetHeight(h);
}
-void wxBitmap::SetQuality(int q)
+void wxBitmap::SetDepth(int d)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
-
- M_BITMAPDATA->m_quality = q;
+ AllocExclusive();
+ M_BITMAPDATA->SetDepth(d);
}
void wxBitmap::SetOk(bool isOk)
{
- if (!M_BITMAPDATA)
- m_refData = new wxBitmapRefData;
-
- M_BITMAPDATA->m_ok = isOk;
+ AllocExclusive();
+ M_BITMAPDATA->SetOk(isOk);
}
+#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const
{
wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap GetPalette()") );
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.
- if (M_BITMAPDATA->m_bitmapMask)
- delete M_BITMAPDATA->m_bitmapMask;
+ delete M_BITMAPDATA->m_bitmapMask;
M_BITMAPDATA->m_bitmapMask = mask ;
}
-WXHBITMAP wxBitmap::GetHBITMAP() const
+WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-
- return MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap);
+ return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask));
}
-WXHMETAFILE wxBitmap::GetPict() const
-{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-
- PicHandle picture; // This is the returned picture
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------
- // If bitmap already in Pict format return pointer
- if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict) {
- return M_BITMAPDATA->m_hPict;
- }
- else if(M_BITMAPDATA->m_bitmapType != kMacBitmapTypeGrafWorld) {
- // Invalid bitmap
- return NULL;
- }
-
- RGBColor gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
- RGBColor white = { 0xffff ,0xffff , 0xffff } ;
- RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ;
- CGrafPtr origPort;
- GDHandle origDev ;
- wxMask *mask;
- Rect portRect ;
-
- GetPortBounds( (GWorldPtr) GetHBITMAP() , &portRect ) ;
- int width = portRect.right - portRect.left ;
- int height = portRect.bottom - portRect.top ;
-
- LockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP() ) ) ;
- GetGWorld( &origPort , &origDev ) ;
-
- mask = GetMask();
+wxMask::wxMask()
+{
+ Init() ;
+}
- SetGWorld( (GWorldPtr) GetHBITMAP() , NULL ) ;
+wxMask::wxMask(const wxMask &tocopy)
+{
+ Init();
- picture = OpenPicture(&portRect); // open a picture, this disables drawing
- if(!picture) {
- return NULL;
- }
+ m_bytesPerRow = tocopy.m_bytesPerRow;
+ m_width = tocopy.m_width;
+ m_height = tocopy.m_height;
- if( mask )
- {
-#ifdef __DARWIN__
- RGBColor trans = white;
-#else
- RGBBackColor( &gray );
- EraseRect( &portRect );
- RGBColor trans = gray;
-#endif
- RGBForeColor( &black ) ;
- RGBBackColor( &white ) ;
- PenMode(transparent);
-
- for ( int y = 0 ; y < height ; ++y )
- {
- for( int x = 0 ; x < width ; ++x )
- {
- if ( !mask->PointMasked(x,y) )
- {
- RGBColor col ;
-
- GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
- SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
- }
- else {
- // With transparency this sets a blank pixel
- SetCPixel( x + portRect.left , y + portRect.top , &trans);
- }
- }
- }
- }
- else
- {
- RGBBackColor( &gray ) ;
- EraseRect(&portRect);
- RGBForeColor( &black ) ;
- RGBBackColor( &white ) ;
-
- CopyBits(GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()),
- // src PixMap - we copy image over itself -
- GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()),
- // dst PixMap - no drawing occurs
- &portRect, // srcRect - it will be recorded and compressed -
- &portRect, // dstRect - into the picture that is open -
- srcCopy,NULL); // copyMode and no clip region
- }
- ClosePicture(); // We are done recording the picture
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP() ) ) ;
- SetGWorld( origPort , origDev ) ;
-
- return picture; // return our groovy pict handle
-}
-
-/*
- * wxMask
- */
+ 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<size; i++)
+ {
+ *dest++ = *source++;
+ }
-wxMask::wxMask()
-{
- m_maskBitmap = 0;
+ m_memBuf.UngetWriteBuf( size ) ;
+ RealizeNative() ;
}
// Construct a mask from a bitmap and a colour indicating
// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
+wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
- m_maskBitmap = 0;
- Create(bitmap, colour);
+ Init() ;
+ Create( bitmap, colour );
}
-// Construct a mask from a bitmap and a palette index indicating
-// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
+// Construct a mask from a mono bitmap (copies the bitmap).
+wxMask::wxMask( const wxBitmap& bitmap )
{
- m_maskBitmap = 0;
- Create(bitmap, paletteIndex);
+ Init() ;
+ Create( bitmap );
}
// Construct a mask from a mono bitmap (copies the bitmap).
-wxMask::wxMask(const wxBitmap& bitmap)
+
+wxMask::wxMask( const wxMemoryBuffer& data, int width , int height , int bytesPerRow )
{
- m_maskBitmap = 0;
- Create(bitmap);
+ Init() ;
+ Create( data, width , height , bytesPerRow );
}
wxMask::~wxMask()
{
+#ifndef __LP64__
if ( m_maskBitmap )
{
- wxMacDestroyGWorld( (GWorldPtr) m_maskBitmap ) ;
+ DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;
m_maskBitmap = NULL ;
}
+#endif
}
-// Create a mask from a mono bitmap (copies the bitmap).
-bool wxMask::Create(const wxBitmap& bitmap)
+void wxMask::Init()
{
- if ( m_maskBitmap )
- {
- wxMacDestroyGWorld( (GWorldPtr) m_maskBitmap ) ;
- m_maskBitmap = NULL ;
- }
- wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
- wxT("Cannot create mask from this bitmap type (TODO)"));
- // other types would require a temporary bitmap. not yet implemented
+ m_width = m_height = m_bytesPerRow = 0 ;
+ m_maskBitmap = NULL ;
+}
- wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap"));
+void *wxMask::GetRawAccess() const
+{
+ return m_memBuf.GetData() ;
+}
- wxCHECK_MSG(bitmap.GetDepth() == 1, false,
- wxT("Cannot create mask from colour bitmap"));
+// 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
- m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
- Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
+void wxMask::RealizeNative()
+{
+#ifndef __LP64__
+ if ( m_maskBitmap )
+ {
+ DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;
+ m_maskBitmap = NULL ;
+ }
- LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
- LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );
- CopyBits(GetPortBitMapForCopyBits( (GWorldPtr) bitmap.GetHBITMAP()),
- GetPortBitMapForCopyBits( (GWorldPtr) m_maskBitmap),
- &rect, &rect, srcCopy, 0);
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );
+ Rect rect = { 0 , 0 , m_height , m_width } ;
- return FALSE;
+ OSStatus err = NewGWorldFromPtr(
+ (GWorldPtr*) &m_maskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
+ (char*) m_memBuf.GetData() , m_bytesPerRow ) ;
+ verify_noerr( err ) ;
+#endif
}
-// Create a mask from a bitmap and a palette index indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
+// Create a mask from a mono bitmap (copies the bitmap).
+
+bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow)
{
-// TODO
- wxCHECK_MSG( 0, false, wxT("Not implemented"));
- return FALSE;
+ 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 bitmap and a colour indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
+// Create a mask from a mono bitmap (copies the bitmap).
+bool wxMask::Create(const wxBitmap& bitmap)
{
- if ( m_maskBitmap )
- {
- wxMacDestroyGWorld( (GWorldPtr) m_maskBitmap ) ;
- m_maskBitmap = NULL ;
- }
- wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
- wxT("Cannot create mask from this bitmap type (TODO)"));
- // other types would require a temporary bitmap. not yet implemented
-
- wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap"));
-
- m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 );
- LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap ) );
- LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) );
- RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel());
-
- // this is not very efficient, but I can't think
- // of a better way of doing it
- CGrafPtr origPort ;
- GDHandle origDevice ;
- RGBColor col;
- RGBColor colors[2] = {
- { 0xFFFF, 0xFFFF, 0xFFFF },
- { 0, 0, 0 }};
-
- GetGWorld( &origPort , &origDevice ) ;
- for (int w = 0; w < bitmap.GetWidth(); w++)
+ m_width = bitmap.GetWidth() ;
+ m_height = bitmap.GetHeight() ;
+ 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 )
{
- for (int h = 0; h < bitmap.GetHeight(); h++)
- {
- SetGWorld( (GWorldPtr) bitmap.GetHBITMAP(), NULL ) ;
- GetCPixel( w , h , &col ) ;
- SetGWorld( (GWorldPtr) m_maskBitmap , NULL ) ;
- if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
+ 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 )
{
- SetCPixel( w , h , &colors[0] ) ;
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
}
else
{
- SetCPixel( w , h , &colors[1] ) ;
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
}
}
}
- UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;
- UnlockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) ) ;
- SetGWorld( origPort , origDevice ) ;
- return TRUE;
+ m_memBuf.UngetWriteBuf( size ) ;
+ RealizeNative() ;
+
+ return true;
}
-bool wxMask::PointMasked(int x, int y)
+// Create a mask from a bitmap and a colour indicating
+// the transparent area
+bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
{
- GWorldPtr origPort;
- GDHandle origDevice;
- RGBColor color;
- bool masked = true;
+ m_width = bitmap.GetWidth() ;
+ m_height = bitmap.GetHeight() ;
+ m_bytesPerRow = ( m_width * 4 + 3 ) & 0xFFFFFFC ;
- GetGWorld( &origPort, &origDevice);
+ size_t size = m_bytesPerRow * m_height ;
+ unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
+ wxASSERT( destdatabase != NULL ) ;
- //Set port to mask and see if it masked (1) or not ( 0 )
- SetGWorld( (GWorldPtr) m_maskBitmap, NULL);
- LockPixels(GetGWorldPixMap( (GWorldPtr) m_maskBitmap));
- GetCPixel(x,y, &color);
- masked = !(color.red == 0 && color.green == 0 && color.blue == 0);
- UnlockPixels(GetGWorldPixMap( (GWorldPtr) m_maskBitmap));
+ memset( destdatabase , 0 , size ) ;
+ unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
- SetGWorld( origPort, origDevice);
+ for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow)
+ {
+ unsigned char *destdata = destdatabase ;
+ unsigned char r, g, b;
- return masked;
-}
+ for ( int x = 0 ; x < m_width ; ++x )
+ {
+ srcdata++ ;
+ r = *srcdata++ ;
+ g = *srcdata++ ;
+ b = *srcdata++ ;
-/*
- * wxBitmapHandler
- */
+ if ( colour == wxColour( r , g , b ) )
+ {
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
+ *destdata++ = 0xFF ;
+ }
+ else
+ {
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
+ *destdata++ = 0x00 ;
+ }
+ }
+ }
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
-{
- return FALSE;
-}
+ m_memBuf.UngetWriteBuf( size ) ;
+ RealizeNative() ;
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
-{
- return FALSE;
+ return true;
}
-bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+WXHBITMAP wxMask::GetHBITMAP() const
{
- return FALSE;
+ return m_maskBitmap ;
}
-/*
- * Standard handlers
- */
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+
+// ----------------------------------------------------------------------------
+// Standard Handlers
+// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
{
DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler)
+
public:
inline wxPICTResourceHandler()
{
- m_name = "Macintosh Pict resource";
- m_extension = "";
- m_type = wxBITMAP_TYPE_PICT_RESOURCE;
+ 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(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
Str255 theName ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) theName , name ) ;
-#else
- strcpy( (char *) theName , name ) ;
- c2pstr( (char *)theName ) ;
-#endif
-
+ wxMacStringToPascal( name , 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 ;
+ wxMetafile mf ;
+
+ mf.SetHMETAFILE( (WXHMETAFILE) thePict ) ;
+ bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ;
+ wxMemoryDC dc ;
+ dc.SelectObject( *bitmap ) ;
+ mf.Play( &dc ) ;
+ dc.SelectObject( wxNullBitmap ) ;
+
+ return true ;
}
- return FALSE ;
+#endif
+
+ return false ;
}
void wxBitmap::InitStandardHandlers()
{
- AddHandler(new wxPICTResourceHandler) ;
- AddHandler(new wxICONResourceHandler) ;
+ AddHandler( new wxPICTResourceHandler ) ;
+ AddHandler( new wxICONResourceHandler ) ;
+}
+
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------
+
+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 BeginRawAccess() ;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+{
+ EndRawAccess() ;
+}
+
+void wxBitmap::UseAlpha()
+{
+ // remember that we are using alpha channel:
+ // we'll need to create a proper mask in UngetRawData()
+ M_BITMAPDATA->UseAlpha( true );
}
projects / wxWidgets.git / blobdiff