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 | |
parent | ce0c3c1eb1405912f36a3ad7e850a5b4e17a3f2c (diff) |
Bypass fields that are unused for iOS
Change-Id: I378228808ef8f974e574714f48a2faf23123714b
-rw-r--r-- | vcl/headless/svpgdi.cxx | 12 | ||||
-rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 6 |
2 files changed, 15 insertions, 3 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, diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index ad544df1f12a..50a3f872d5c6 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -45,12 +45,16 @@ class SvpSalGraphics : public SalGraphics basebmp::Color m_aLineColor; bool m_bUseFillColor; basebmp::Color m_aFillColor; - basebmp::Color m_aTextColor; basebmp::DrawMode m_aDrawMode; +#ifndef IOS + // These fields are used only when we use FreeType to draw into a + // headless backend, i.e. not on iOS. + basebmp::Color m_aTextColor; ServerFont* m_pServerFont[ MAX_FALLBACK ]; sal_uInt32 m_eTextFmt; +#endif basebmp::BitmapDeviceSharedPtr m_aClipMap; |