slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 63162c960ae6f0d70740a6bba2cf225d2d8d3688 Author: Thorsten Behrens <tbehr...@suse.com> Date: Tue Aug 13 11:01:54 2013 +0200 Fix fdo#67908 - keep Visual around until after GL context is created. Change-Id: Ie84decdccfa5bbf44c9cb05e2c2229f7384c1912 Reviewed-on: https://gerrit.libreoffice.org/5386 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 65c992a..23c10a0 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -578,7 +578,6 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] ); mbHasTFPVisual = true; pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow ); - XFree ( vi ); SAL_INFO("slideshow.opengl", "found visual suitable for texture_from_pixmap"); } else if( firstVisual && pAttributeTable[1] == NULL ) { vi = firstVisual; @@ -599,7 +598,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) } #if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) - if ( firstVisual ) + if ( firstVisual && vi != firstVisual ) XFree (firstVisual); #endif @@ -681,6 +680,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta GLWin.vi, 0, GL_TRUE); + XFree ( GLWin.vi ); if( GLWin.ctx == NULL ) { SAL_INFO("slideshow.opengl", "unable to create GLX context"); return false; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits