diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-13 17:47:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-13 17:48:37 +0200 |
| commit | b409ca53a59b5fb9978a81f6e395775b3577e179 (patch) | |
| tree | b8437bc908377526907ca33619d31d31d655cb7d /slideshow | |
| parent | 6f2472e8d1451837500d76c7e705331b28fd33d9 (diff) | |
warning C4189 local variable initialized but not referenced
Change-Id: I7bea7063d924318eed07a2fad4ec88ea942302a0
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 673d72a56d81..949dc36adf20 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -442,10 +442,10 @@ void OGLTransitionerImpl::impl_prepareSlides() mbUseLeavingPixmap = false; mbUseEnteringPixmap = false; - GLWindow& rGLWindow(mpContext->getOpenGLWindow()); - #if defined( GLX_EXT_texture_from_pixmap ) + GLWindow& rGLWindow(mpContext->getOpenGLWindow()); + if( mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { Sequence< Any > leaveArgs; Sequence< Any > enterArgs; @@ -1245,9 +1245,9 @@ void OGLTransitionerImpl::disposeTextures() { mpContext->makeCurrent(); +#if defined( GLX_EXT_texture_from_pixmap ) GLWindow& rGLWindow(mpContext->getOpenGLWindow()); -#if defined( GLX_EXT_texture_from_pixmap ) PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC) glXGetProcAddress( (const GLubyte*) "glXReleaseTexImageEXT" ); if( mbUseLeavingPixmap ) { myglXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT ); |