Kaydet (Commit) 1af1ff30 authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Markus Mohrhard

constify slideshow.

Change-Id: I548f527be4be76a2bda43dcb5ee14e4f50f3b409
üst e8757c22
...@@ -446,7 +446,7 @@ void OGLTransitionerImpl::impl_prepareSlides() ...@@ -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 ...@@ -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() ...@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment