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

[Caolán McNamara]

 vcl/opengl/x11/gdiimpl.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 48138a1d60fafa0bf3412aa6b518a9c0a4f6d492
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Nov 24 20:47:05 2014 +0000

    WaE: might be used unintialized
    
    Change-Id: I036a5a1c8c8cca09bb6bddef2e0c8f172fe22e77

diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 221c1ef..80db3a9 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -156,9 +156,6 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( 
X11Pixmap* pPixmap, X11Pixm
         None
     };
     Display* pDisplay = mrParent.GetXDisplay();
-    GLXFBConfig pFbConfig;
-    GLXPixmap pGlxPixmap;
-    GLXPixmap pGlxMask;
     bool bInverted;
 
     SAL_INFO( "vcl.opengl", "RenderPixmapToScreen (" << nX << " " << nY << ")" 
);
@@ -171,10 +168,13 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( 
X11Pixmap* pPixmap, X11Pixm
     //glClear( GL_COLOR_BUFFER_BIT );
 
     XSync( pDisplay, 0 );
-    pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, bInverted );
-    pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, pPixmap->GetPixmap(), 
aAttribs);
+    GLXFBConfig pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, 
bInverted );
+    GLXPixmap pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, 
pPixmap->GetPixmap(), aAttribs);
+    GLXPixmap pGlxMask;
     if( pMask != NULL )
         pGlxMask = glXCreatePixmap( pDisplay, pFbConfig, pMask->GetPixmap(), 
aAttribs);
+    else
+        pGlxMask = 0;
     XSync( pDisplay, 0 );
 
     if( !pGlxPixmap )

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits