[Libreoffice-commits] core.git: 2 commits - slideshow/source

[Michael Stahl]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx   |    5 -----
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit b409ca53a59b5fb9978a81f6e395775b3577e179
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 17:47:53 2014 +0200

    warning C4189 local variable initialized but not referenced
    
    Change-Id: I7bea7063d924318eed07a2fad4ec88ea942302a0

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 673d72a..949dc36 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 );
commit 6f2472e8d1451837500d76c7e705331b28fd33d9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 17:46:09 2014 +0200

    slideshow: prewin.h/postwin.h included twice
    
    Builds for me without that...
    
    Change-Id: I6db654098ee8f93a0cad80e7534c694971aebf5d

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 4288bbf..80c4b41 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -33,11 +33,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
-#ifdef _WIN32
-#include <prewin.h>
-#include <postwin.h>
-#endif
-
 #include <GL/gl.h>
 
 #include <basegfx/vector/b2dvector.hxx>