wxBitmapRefData(int width , int height , int depth);
wxBitmapRefData();
wxBitmapRefData(const wxBitmapRefData &tocopy);
-
+
virtual ~wxBitmapRefData();
-
+
+ virtual bool IsOk() const { return m_ok; }
+
void Free();
- bool Ok() const { return IsOk(); }
- bool IsOk() const { return m_ok; }
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_rawAccessCount;
bool m_ok;
mutable CGImageRef m_cgImageRef;
-
+
IconRef m_iconRef;
PicHandle m_pictHandle;
-
+
CGContextRef m_hBitmap;
};
wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
{
Init();
- Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth);
-
+ 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)
m_width = wxMax(1, w);
m_height = wxMax(1, h);
m_depth = d ;
+ m_hBitmap = NULL ;
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 ( data != NULL )
+ {
+ memset( data , 0 , size ) ;
+ m_memBuf.UngetWriteBuf( size ) ;
+
+ m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
+ wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
+ CGContextTranslateCTM( m_hBitmap, 0, m_height );
+ CGContextScaleCTM( m_hBitmap, 1, -1 );
+ } /* data != NULL */
m_ok = ( m_hBitmap != NULL ) ;
return m_ok ;
void *wxBitmapRefData::GetRawAccess() const
{
- wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+ wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ;
return m_memBuf.GetData() ;
}
void *wxBitmapRefData::BeginRawAccess()
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ) ;
+ 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") ) ;
void wxBitmapRefData::EndRawAccess()
{
- wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+ wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ;
wxASSERT( m_rawAccessCount == 1 ) ;
--m_rawAccessCount ;
#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 * 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++ = 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 ) ;
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 ) ;
+
+ wxCHECK_MSG( err == noErr, NULL, wxT("Error when constructing icon ref") );
}
return m_iconRef ;
return m_pictHandle ;
}
-void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
-
-void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t WXUNUSED(size))
-{
- wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
-
- wxASSERT( data == membuf->GetData() ) ;
-
- delete membuf ;
-}
-
CGImageRef wxBitmapRefData::CreateCGImage() const
{
wxASSERT( m_ok ) ;
int w = m_width ;
int h = m_height ;
CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ;
- wxMemoryBuffer* membuf = NULL ;
-
+ wxMemoryBuffer membuf;
+
if ( m_bitmapMask )
{
alphaInfo = kCGImageAlphaFirst ;
- membuf = new wxMemoryBuffer( imageSize ) ;
- memcpy( membuf->GetData() , dataBuffer , imageSize ) ;
+ 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() ;
- unsigned char *destalphastart = (unsigned char *) membuf->GetData() ;
for ( int y = 0 ; y < h ; ++y , destalphastart += m_bytesPerRow, sourcemaskstart += maskrowbytes)
{
unsigned char *sourcemask = sourcemaskstart ;
*destalpha = 0xFF - *sourcemask ;
}
}
+ membuf.UngetWriteBuf( imageSize );
}
else
{
alphaInfo = kCGImageAlphaFirst ;
#endif
}
-
- membuf = new wxMemoryBuffer( m_memBuf ) ;
+
+ membuf = 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() ;
+ // 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
- for( int i = 0 ; i < m_width * m_height ; ++i )
- maskBufData[i] = bufData[i*4+3];
+ 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 =
- 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 ;
-
+ wxMacCGDataProviderCreateWithMemoryBuffer( maskBuf );
+
image = ::CGImageMaskCreate( w, h, 8, 8, m_width , dataProvider, NULL, false );
}
else
{
CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
- dataProvider =
- CGDataProviderCreateWithData(
- membuf , (const void *)membuf->GetData() , imageSize,
- wxMacMemoryBufferReleaseProc );
+ dataProvider = wxMacCGDataProviderCreateWithMemoryBuffer( membuf );
image =
::CGImageCreate(
w, h, 8 , 32 , m_bytesPerRow , colorSpace, alphaInfo ,
*destination++ = ( (*source++) * a + 127 ) / 255;
*destination++ = ( (*source++) * a + 127 ) / 255;
*destination++ = ( (*source++) * a + 127 ) / 255;
-#else
+#else
*destination++ = *source++ ;
*destination++ = *source++ ;
*destination++ = *source++ ;
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
{
- m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
-
- if ( no_bits == 1 )
- {
- int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
- if ( the_width % (sizeof(unsigned char) * 8) )
- linesize += sizeof(unsigned char);
+ wxBitmapRefData* bitmapRefData;
- unsigned char* linestart = (unsigned char*) bits ;
- unsigned char* destptr = (unsigned char*) BeginRawAccess() ;
+ m_refData = bitmapRefData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
- for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )
+ if (bitmapRefData->IsOk())
+ {
+ if ( no_bits == 1 )
{
- unsigned char* destination = destptr;
- int index, bit, mask;
+ 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 x = 0 ; x < the_width ; ++x )
+ for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )
{
- index = x / 8 ;
- bit = x % 8 ;
- mask = 1 << bit ;
+ unsigned char* destination = destptr;
+ int index, bit, mask;
- if ( linestart[index] & mask )
- {
- *destination++ = 0xFF ;
- *destination++ = 0 ;
- *destination++ = 0 ;
- *destination++ = 0 ;
- }
- else
+ for ( int x = 0 ; x < the_width ; ++x )
{
- *destination++ = 0xFF ;
- *destination++ = 0xFF ;
- *destination++ = 0xFF ;
- *destination++ = 0xFF ;
+ 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"));
- }
+ EndRawAccess() ;
+ }
+ else
+ {
+ wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
+ }
+ } /* bitmapRefData->IsOk() */
}
wxBitmap::wxBitmap(int w, int h, int d)
LoadFile(filename, type);
}
-wxObjectRefData* wxBitmap::CreateRefData() const
+wxGDIRefData* wxBitmap::CreateGDIRefData() const
{
return new wxBitmapRefData;
}
-wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
{
return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
}
IconRef wxBitmap::GetIconRef() const
{
wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
-
+
return M_BITMAPDATA->GetIconRef() ;
}
m_refData = new wxBitmapRefData( w , h , d );
- return M_BITMAPDATA->Ok() ;
+ return M_BITMAPDATA->IsOk() ;
}
bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
wxCHECK_RET( image.Ok(), wxT("invalid image") );
-
+
// width and height of the device-dependent bitmap
int width = image.GetWidth();
int height = image.GetHeight();
+
+ wxBitmapRefData* bitmapRefData;
- m_refData = new wxBitmapRefData( width , height , depth ) ;
-
- // Create picture
-
- bool hasAlpha = false ;
-
- if ( image.HasMask() )
- {
- // takes precedence, don't mix with alpha info
- }
- else
- {
- hasAlpha = image.HasAlpha() ;
- }
-
- if ( hasAlpha )
- UseAlpha() ;
-
- unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ;
- register unsigned char* data = image.GetData();
- if ( destinationstart != NULL && data != NULL )
+ m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
+
+ if ( bitmapRefData->IsOk())
{
- const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
- for (int y = 0; y < height; destinationstart += M_BITMAPDATA->GetBytesPerRow(), y++)
+ // Create picture
+
+ bool hasAlpha = false ;
+
+ if ( image.HasMask() )
{
- unsigned char * destination = destinationstart;
- for (int x = 0; x < width; x++)
+ // takes precedence, don't mix with alpha info
+ }
+ 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++)
{
- if ( hasAlpha )
+ unsigned char * destination = destinationstart;
+ for (int x = 0; x < width; x++)
{
- 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++ ;
+ 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() ;
}
-
- EndRawAccess() ;
- }
- if ( image.HasMask() )
- SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
+ if ( image.HasMask() )
+ SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
+ } /* bitmapRefData->IsOk() */
}
wxImage wxBitmap::ConvertToImage() const
return success;
}
-bool wxBitmap::IsOk() const
-{
- return (M_BITMAPDATA && M_BITMAPDATA->Ok());
-}
-
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceGray();
// from MouseTracking sample :
- // Ironically, due to a bug in CGImageCreateWithMask, you cannot use
+ // 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,
+
+ 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") ) ;
projects / wxWidgets.git / blobdiff