summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-24 20:47:05 +0000
committerEike Rathke <erack@redhat.com>2014-12-02 23:57:30 +0100
commit4483fb28546f81b205159d9a8e4f5d41d3c90ac5 (patch)
tree94cd42b329f391a726cb09908f2fe526b13ded7f
parent60fe8a4cd6c0697fbc1c9b8988a8340c1f29a174 (diff)
WaE: might be used unintialized
Change-Id: I036a5a1c8c8cca09bb6bddef2e0c8f172fe22e77 (cherry picked from commit 48138a1d60fafa0bf3412aa6b518a9c0a4f6d492)
-rw-r--r--vcl/opengl/x11/gdiimpl.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 4442bbde1a89..e5070d7b02c7 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -129,9 +129,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 << ")" );
@@ -144,10 +141,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 )