strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use my improved understanding of what a subset BitmapDevice is

Browse source 
Need to pass the whole pixel buffer to CGBitmapContextCreate().

Change-Id: Iadac7dc3e63c29e5d0cc328b2e2a1f10824248a6
This commit is contained in:
Tor Lillqvist 2013-04-12 02:14:33 +03:00
parent d520bd0903
commit 84587bdf9a
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
vcl/coretext/salgdi.cxx
View file

@ -283,23 +283,30 @@ void QuartzSalGraphics::SetTextColor( SalColor nSalColor )
bool SvpSalGraphics::CheckContext()
{
basegfx::B2IVector size = m_aDevice->getSize();
const basegfx::B2IVector size = m_aDevice->getSize();
const basegfx::B2IVector bufferSize = m_aDevice->getBufferSize();
const sal_Int32 scanlineStride = m_aDevice->getScanlineStride();
basebmp::RawMemorySharedArray pixelBuffer = m_aDevice->getBuffer();
SAL_INFO( "vcl.ios", "CheckContext: device=" << m_aDevice.get() << " size=" << size.getX() << "x" << size.getY() << (m_aDevice->isTopDown() ? " top-down" : " bottom-up") << " stride=" << m_aDevice->getScanlineStride() );
SAL_INFO( "vcl.ios",
"CheckContext: device=" << m_aDevice.get() <<
" size=" << size.getX() << "x" << size.getY() <<
(m_aDevice->isTopDown() ? " top-down" : " bottom-up") <<
" stride=" << scanlineStride <<
" bufferSize=(" << bufferSize.getX() << "," << bufferSize.getY() << ")" );
switch( m_aDevice->getScanlineFormat() ) {
case basebmp::Format::EIGHT_BIT_PAL:
mrContext = CGBitmapContextCreate(pixelBuffer.get(),
size.getX(), size.getY(),
8, m_aDevice->getScanlineStride(),
bufferSize.getX(), bufferSize.getY(),
8, scanlineStride,
CGColorSpaceCreateDeviceGray(),
kCGImageAlphaNone);
break;
case basebmp::Format::THIRTYTWO_BIT_TC_MASK_RGBA:
mrContext = CGBitmapContextCreate(pixelBuffer.get(),
size.getX(), size.getY(),
8, m_aDevice->getScanlineStride(),
bufferSize.getX(), bufferSize.getY(),
8, scanlineStride,
CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaNoneSkipLast);
break;
@ -309,12 +316,17 @@ bool SvpSalGraphics::CheckContext()
SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
// Should we also clip the context? (Then we need to add a
// getBounds() function to BitmapDevice.)
if( mrContext != NULL && m_aDevice->isTopDown() )
{
CGContextTranslateCTM( mrContext, 0, size.getY() );
CGContextTranslateCTM( mrContext, 0, bufferSize.getY() );
CGContextScaleCTM( mrContext, 1, -1 );
}
SAL_INFO( "vcl.ios", "CheckContext: context=" << mrContext );
return ( mrContext != NULL );
}