diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-08-09 10:58:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-10 16:37:32 +0300 |
| commit | f3346b1fc568f044aa02b01758a9598aed0c95e7 (patch) | |
| tree | 051374f22f7503aeaa409171b349fccd9b50f259 | |
| parent | 8778a3e03945f5bafabb0274e3bd79aab6ee92f4 (diff) | |
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
| -rw-r--r-- | vcl/headless/svpframe.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
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 <basegfx/vector/b2ivector.hxx> +#ifndef IOS #include <cairo.h> +#endif using namespace basegfx; @@ -44,7 +46,9 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, m_pParent( static_cast<SvpSalFrame*>(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<void *>(&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() |