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

Thorsten Behrens Thorsten.Behrens at CIB.de
Sat Aug 29 15:36:34 PDT 2015


 vcl/source/opengl/OpenGLContext.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 5191fcb11688ef8f4ec312293e57e151762c6952
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Sun Aug 30 00:33:49 2015 +0200

    werror: fix build in vcl
    
    Change-Id: I30f9e1858c90943e1d369aeea02e10d8037a4ca8

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 8253241..70a6cbc5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -785,9 +785,13 @@ bool OpenGLContext::ImplInit()
             glXSwapInterval( 1 );
 
             if( errorTriggered )
+            {
                 SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?");
+            }
             else
+            {
                 VCL_GL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)");
+            }
         }
     }
 
@@ -1359,6 +1363,7 @@ void OpenGLContext::makeCurrent()
 
     // move the context to the end of the contexts list
     static int nSwitch = 0;
+    (void) nSwitch; // -Werror=unused-variable
     VCL_GL_INFO("vcl.opengl", "******* CONTEXT SWITCH " << ++nSwitch << " *********");
     if( mpNextContext )
     {


More information about the Libreoffice-commits mailing list