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

fixing pict export under coregraphics with quicktime, using tiger functions for faster conversion where possible

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-06-12 19:49:51 +00:00
parent 9c952d068f
commit 50af8f6e66
1 changed files with 80 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/bitmap.cpp
View File

@@ -646,6 +646,7 @@ PicHandle wxBitmapRefData::GetPictHandle()
if ( clipRgn ) if ( clipRgn )
DisposeRgn( clipRgn ) ; DisposeRgn( clipRgn ) ;
#else #else
#ifndef __LP64__
GraphicsExportComponent exporter = 0; GraphicsExportComponent exporter = 0;
OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter); OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter);
if (noErr == err) if (noErr == err)
@@ -656,9 +657,17 @@ PicHandle wxBitmapRefData::GetPictHandle()
err = GraphicsExportSetInputCGBitmapContext( exporter, m_hBitmap); err = GraphicsExportSetInputCGBitmapContext( exporter, m_hBitmap);
err = GraphicsExportSetOutputHandle(exporter, (Handle)m_pictHandle); err = GraphicsExportSetOutputHandle(exporter, (Handle)m_pictHandle);
err = GraphicsExportDoExport(exporter, NULL); err = GraphicsExportDoExport(exporter, NULL);
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 ); CloseComponent( exporter );
} }
#endif
#endif #endif
} }
@@ -681,6 +690,14 @@ CGImageRef wxBitmapRefData::CGImageCreate() const
wxASSERT( m_rawAccessCount >= 0 ) ; wxASSERT( m_rawAccessCount >= 0 ) ;
CGImageRef image ; CGImageRef image ;
if ( m_rawAccessCount > 0 || m_cgImageRef == NULL ) if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( UMAGetSystemVersion() >= 0x1040 && m_depth != 1 && m_bitmapMask == NULL )
{
image = CGBitmapContextCreateImage( m_hBitmap );
}
else
#endif
{ {
size_t imageSize = m_height * m_bytesPerRow ; size_t imageSize = m_height * m_bytesPerRow ;
void * dataBuffer = m_memBuf.GetData() ; void * dataBuffer = m_memBuf.GetData() ;
@@ -754,6 +771,7 @@ CGImageRef wxBitmapRefData::CGImageCreate() const
} }
CGDataProviderRelease( dataProvider); CGDataProviderRelease( dataProvider);
} }
}
else else
{ {
image = m_cgImageRef ; image = m_cgImageRef ;