diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-03 23:36:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-03 23:38:15 +0300 |
| commit | de2ccd8e1ad3eeb5545e4dcccfe40ec81929a9ed (patch) | |
| tree | 2f24a525645dd6e6119c632f83ab4be33644ac97 /vcl/headless | |
| parent | ce0c3c1eb1405912f36a3ad7e850a5b4e17a3f2c (diff) | |
Bypass fields that are unused for iOS
Change-Id: I378228808ef8f974e574714f48a2faf23123714b
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index ca95dc3157df..96733ec97d8c 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -80,14 +80,17 @@ SvpSalGraphics::SvpSalGraphics() : m_aLineColor( COL_BLACK ), m_bUseFillColor( false ), m_aFillColor( COL_WHITE ), - m_aTextColor( COL_BLACK ), m_aDrawMode( basebmp::DrawMode_PAINT ), +#ifndef IOS + m_aTextColor( COL_BLACK ), m_eTextFmt( basebmp::Format::EIGHT_BIT_GREY ), +#endif m_bClipSetup( false ) { +#ifndef IOS for( int i = 0; i < MAX_FALLBACK; ++i ) m_pServerFont[i] = NULL; -#ifdef IOS +#else mrContext = nil; mfFakeDPIScale = 1.0; m_style = new CoreTextStyleInfo(); @@ -115,6 +118,7 @@ void SvpSalGraphics::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice ) m_aOrigDevice = rDevice; ResetClipRegion(); +#ifndef IOS // determine matching bitmap format for masks sal_uInt32 nDeviceFmt = m_aDevice->getScanlineFormat(); DBG_ASSERT( (nDeviceFmt <= (sal_uInt32)basebmp::Format::MAX), "SVP::setDevice() with invalid bitmap format" ); @@ -134,6 +138,7 @@ void SvpSalGraphics::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice ) m_eTextFmt = basebmp::Format::ONE_BIT_LSB_GREY; break; } +#endif } void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) @@ -551,6 +556,9 @@ void SvpSalGraphics::copyArea( long nDestX, void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) { + if( !m_aDevice.get() ) + return; + SvpSalGraphics* pSrc = pSrcGraphics ? static_cast<SvpSalGraphics*>(pSrcGraphics) : this; basegfx::B2IBox aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY, |