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

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Sep 1 17:19:53 PDT 2014


 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 8e4defe4b59a72fbe82f94b26e233ba36640c739
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 2 02:19:14 2014 +0200

    fix Wunused-private-field
    
    Change-Id: Ia708cc3cccd86257e08aa916d24733ca6769e723

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index bb0e979..8faa728 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -253,11 +253,15 @@ private:
     GLXPixmap maLeavingPixmapGL;
     GLXPixmap maEnteringPixmapGL;
 #endif
+#if defined( UNX ) && !defined( MACOSX )
     bool mbRestoreSync;
+#endif
     bool mbUseLeavingPixmap;
     bool mbUseEnteringPixmap;
+#if defined( GLX_EXT_texture_from_pixmap )
     bool mbFreeLeavingPixmap;
     bool mbFreeEnteringPixmap;
+#endif
 #if defined( UNX ) && !defined( MACOSX )
     Pixmap maLeavingPixmap;
     Pixmap maEnteringPixmap;
@@ -1354,11 +1358,15 @@ OGLTransitionerImpl::OGLTransitionerImpl()
     , maLeavingPixmapGL(0)
     , maEnteringPixmapGL(0)
 #endif
+#if defined( UNX ) && !defined( MACOSX )
     , mbRestoreSync(false)
+#endif
     , mbUseLeavingPixmap(false)
     , mbUseEnteringPixmap(false)
+#if defined( GLX_EXT_texture_from_pixmap )
     , mbFreeLeavingPixmap(false)
     , mbFreeEnteringPixmap(false)
+#endif
 #if defined( UNX ) && !defined( MACOSX )
     , maLeavingPixmap(0)
     , maEnteringPixmap(0)


More information about the Libreoffice-commits mailing list