diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 10:58:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 10:59:09 +0200 |
| commit | 7195c7e8b80f0a875126e9275aa12e4608b1763c (patch) | |
| tree | ee3bd0cdd451679fec12923bf704165c30dbc680 /slideshow/source/engine/opengl | |
| parent | 2dc980990316e1efd1c21ecc5050bbc134838f7a (diff) | |
loplugin:expandablemethods in slideshow
Change-Id: I3a7207e0566bc4b871b364da3180ce67e1099de8
Diffstat (limited to 'slideshow/source/engine/opengl')
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionerImpl.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 6e2f5a98a055..ef1d385e77fb 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -201,7 +201,6 @@ private: void GLInitSlides(); bool impl_prepareTransition(); - void impl_finishTransition(); private: rtl::Reference<OpenGLContext> mpContext; @@ -412,12 +411,6 @@ bool OGLTransitionerImpl::impl_prepareTransition() return false; } -void OGLTransitionerImpl::impl_finishTransition() -{ - if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= mnGLVersion ) - mpTransition->finish(); -} - bool OGLTransitionerImpl::setTransition( const std::shared_ptr<OGLTransitionImpl>& pTransition ) { if ( mpTransition ) // already initialized @@ -1106,7 +1099,8 @@ void OGLTransitionerImpl::impl_dispose() mpContext->makeCurrent(); CHECK_GL_ERROR(); - impl_finishTransition(); + if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= mnGLVersion ) + mpTransition->finish(); disposeTextures(); if( mpContext.is() ) mpContext->dispose(); |