mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constify slideshow.

Browse Source 
Change-Id: I548f527be4be76a2bda43dcb5ee14e4f50f3b409
This commit is contained in:
Michael Meeks
2014-11-04 09:31:29 +00:00
committed by Markus Mohrhard
parent e8757c22e3
commit 1af1ff30bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
View File

@@ -446,7 +446,7 @@ void OGLTransitionerImpl::impl_prepareSlides()
#if defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
GLWindow& rGLWindow(mpContext->getOpenGLWindow()); const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
if( GLXEW_EXT_texture_from_pixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { if( GLXEW_EXT_texture_from_pixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) {
Sequence< Any > leaveArgs; Sequence< Any > leaveArgs;
@@ -1218,7 +1218,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
if(mpTransition) if(mpTransition)
{ {
GLWindow& rGLWindow(mpContext->getOpenGLWindow()); const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
mpTransition->display( nTime, maLeavingSlideGL, maEnteringSlideGL, mpTransition->display( nTime, maLeavingSlideGL, maEnteringSlideGL,
maSlideSize.Width, maSlideSize.Height, maSlideSize.Width, maSlideSize.Height,
static_cast<double>(rGLWindow.Width), static_cast<double>(rGLWindow.Width),
@@ -1261,7 +1261,7 @@ void OGLTransitionerImpl::disposeTextures()
mpContext->makeCurrent(); mpContext->makeCurrent();
#if defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
GLWindow& rGLWindow(mpContext->getOpenGLWindow()); const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
if( mbUseLeavingPixmap ) { if( mbUseLeavingPixmap ) {
glXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT ); glXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT );