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

adding old 'pict' support to quartz mode for receiving bitmapobjs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-01-11 19:18:57 +00:00
parent dc21f4bbb0
commit 7edab562a0
1 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/mac/carbon/dataobj.cpp
View File

@@ -735,7 +735,7 @@ void wxBitmapDataObject::Clear()
m_pictCreated = false;
}
bool wxBitmapDataObject::GetDataHere( void *pBuf ) const
bool wxBitmapDataObject::GetDataHere( const wxDataFormat& format, void *pBuf ) const
{
if (m_pictHandle == NULL)
{
@@ -746,13 +746,19 @@ bool wxBitmapDataObject::GetDataHere( void *pBuf ) const
if (pBuf == NULL)
return false;
if ( format != GetPreferredFormat() )
return false;
memcpy( pBuf, *(Handle)m_pictHandle, GetHandleSize( (Handle)m_pictHandle ) );
return true;
}
size_t wxBitmapDataObject::GetDataSize() const
size_t wxBitmapDataObject::GetDataSize( const wxDataFormat& format ) const
{
if ( format != GetPreferredFormat() )
return 0;
if (m_pictHandle != NULL)
return GetHandleSize( (Handle)m_pictHandle );
else
@@ -770,7 +776,43 @@ Handle MacCreateDataReferenceHandle(Handle theDataHandle)
return dataRef;
}
bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
size_t wxBitmapDataObject::GetDataSize() const
{
return GetDataSize(GetPreferredFormat());
}
bool wxBitmapDataObject::GetDataHere(void *buf) const
{
return GetDataHere(GetPreferredFormat(), buf);
}
bool wxBitmapDataObject::SetData(size_t len, const void *buf)
{
return SetData(GetPreferredFormat(), len, buf);
}
size_t wxBitmapDataObject::GetFormatCount(Direction WXUNUSED(dir) ) const
{
#if wxMAC_USE_CORE_GRAPHICS
return 2;
#else
return 1;
#endif
}
static wxDataFormat s_pict( _T("com.apple.pict") );
void wxBitmapDataObject::GetAllFormats(wxDataFormat *formats,
wxDataObjectBase::Direction WXUNUSED(dir) ) const
{
*formats++ = wxDataFormat( wxDF_BITMAP );
#if wxMAC_USE_CORE_GRAPHICS
*formats = s_pict;
#endif
}
bool wxBitmapDataObject::SetData( const wxDataFormat& format, size_t nSize, const void *pBuf )
{
Clear();
@@ -778,14 +820,30 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
return false;
#if wxMAC_USE_CORE_GRAPHICS
Handle picHandle = NewHandle( nSize );
memcpy( *picHandle, pBuf, nSize );
m_pictHandle = picHandle;
Handle picHandle = NULL ;
m_pictHandle = NewHandle( nSize );
memcpy( *(Handle) m_pictHandle, pBuf, nSize );
if ( format == s_pict )
{
// pict for IO expects a 512 byte header
picHandle = NewHandle( nSize + 512 );
memset( *picHandle , 0 , 512 );
memcpy( *picHandle+512, pBuf, nSize );
}
else
{
picHandle = (Handle) m_pictHandle;
}
CGImageRef cgImageRef = 0;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( UMAGetSystemVersion() >= 0x1040 )
{
CFDataRef data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) pBuf, nSize, kCFAllocatorNull);
CFDataRef data = NULL;
HLock( picHandle );
data = CFDataCreateWithBytesNoCopy( kCFAllocatorDefault, (const UInt8*) *picHandle, GetHandleSize(picHandle), kCFAllocatorNull);
CGImageSourceRef source = CGImageSourceCreateWithData( data, NULL );
if ( source )
{
@@ -793,6 +851,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
}
CFRelease( source );
CFRelease( data );
HUnlock( picHandle );
}
else
#endif
@@ -800,7 +859,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
{
// import from TIFF
GraphicsImportComponent importer = 0;
OSStatus err = OpenADefaultComponent(GraphicsImporterComponentType, kQTFileTypeTIFF, &importer);
OSStatus err = OpenADefaultComponent(GraphicsImporterComponentType, s_pict == format ? kQTFileTypePicture : kQTFileTypeTIFF, &importer);
if (noErr == err)
{
if ( picHandle )
@@ -817,6 +876,10 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf )
}
}
#endif
if ( format == s_pict )
{
DisposeHandle( picHandle );
}
if ( cgImageRef )
{
m_bitmap.Create( CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );