diff options
| author | Tor Lillqvist <tml@iki.fi> | 2018-08-31 09:54:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2018-08-31 10:12:04 +0300 |
| commit | 1240a0749e6a23a1a150df61e6a2e05c6b7b55be (patch) | |
| tree | 4349dcd6506c20662643518588c0eb151313cfdd | |
| parent | 4ccac77652d61b823160cac073e3c1bf725352f1 (diff) | |
Fix accidental placement of code inside #if HAVE_FEATURE_OPENGL
No reason for SalGraphics::getSystemDependentDataManager() to be inside
the #if HAVE_FEATURE_OPENGL. Fixes build for iOS.
Change-Id: I3d8174a4841d793f8d7ea2c3ebf3be2888229a3e
| -rw-r--r-- | vcl/source/gdi/salgdilayout.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 08fb2fae49f7..16396a60a98b 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -66,19 +66,6 @@ SalGraphics::~SalGraphics() { } -#if HAVE_FEATURE_OPENGL - -namespace -{ - void disableOpenGLAndTerminateForRestart() - { - OpenGLZone::hardDisable(); -#ifdef _WIN32 - TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART); -#endif - } -} - basegfx::SystemDependentDataManager& SalGraphics::getSystemDependentDataManager() { typedef ::std::map< basegfx::SystemDependentData_SharedPtr, sal_uInt32 > EntryMap; @@ -204,6 +191,19 @@ basegfx::SystemDependentDataManager& SalGraphics::getSystemDependentDataManager( return *aSystemDependentDataBuffer.get(); } +#if HAVE_FEATURE_OPENGL + +namespace +{ + void disableOpenGLAndTerminateForRestart() + { + OpenGLZone::hardDisable(); +#ifdef _WIN32 + TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART); +#endif + } +} + rtl::Reference<OpenGLContext> SalGraphics::GetOpenGLContext() const { OpenGLSalGraphicsImpl *pImpl = dynamic_cast<OpenGLSalGraphicsImpl*>(GetImpl()); @@ -223,6 +223,7 @@ rtl::Reference<OpenGLContext> SalGraphics::GetOpenGLContext() const } return nullptr; } + #endif bool SalGraphics::drawTransformedBitmap( |