From f3346b1fc568f044aa02b01758a9598aed0c95e7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Aug 2016 10:58:03 +0300 Subject: Intermediate iOS hack Just to get this one file to compile. More errors come later. I just spent a short time on this while waiting for something else. Actually I have no idea what we should do on iOS nowadays. Do we want to use cairo? Do we want to use OpenGL? Would it make sense to mimic what we do on Android as much as possible? (But what do we do on Android, and is that by choice or accident?) Even if that might mean not using APIs native to iOS, but slower (not HW accelerated) FLOSS alternatives that perform the same functionality, broadly speaking? Change-Id: Id88a895b90f753417eced744141376656bcf72c3 --- vcl/headless/svpframe.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 7eac6b3a6740..0ce76cf119d1 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -26,7 +26,9 @@ #include +#ifndef IOS #include +#endif using namespace basegfx; @@ -44,7 +46,9 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, m_pParent( static_cast(pParent) ), m_nStyle( nSalFrameStyle ), m_bVisible( false ), +#ifndef IOS m_pSurface( nullptr ), +#endif m_nMinWidth( 0 ), m_nMinHeight( 0 ), m_nMaxWidth( 0 ), @@ -55,7 +59,7 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, memset( static_cast(&m_aSystemChildData), 0, sizeof( SystemEnvData ) ); m_aSystemChildData.nSize = sizeof( SystemEnvData ); #ifdef IOS - (void) nScanlineFormat; + // Nothing #elif defined ANDROID // Nothing #else @@ -111,8 +115,10 @@ SvpSalFrame::~SvpSalFrame() } } } +#ifndef IOS if (m_pSurface) cairo_surface_destroy(m_pSurface); +#endif } void SvpSalFrame::GetFocus() -- cgit