From 67955bfb2ae92baf39dd3c1488aed20bb975b97f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 17 Aug 2012 13:14:58 +0200 Subject: fix indentation Change-Id: I9b077cbbeac37c0eaac1365a8793cbc3f33f8b3e --- .../OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 22 ++-- .../OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 130 ++++++++++----------- 2 files changed, 76 insertions(+), 76 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx index 88e205674cf0..5bbedb6a253d 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx @@ -180,11 +180,11 @@ void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std: glTranslated( 0, 2 - surfaceLevel, 0 ); glCullFace(GL_FRONT); - for(unsigned int i(0); i < primitives.size(); ++i) - primitives[i].display(nTime, SlideWidthScale, SlideHeightScale); + for(unsigned int i(0); i < primitives.size(); ++i) + primitives[i].display(nTime, SlideWidthScale, SlideHeightScale); glCullFace(GL_BACK); - slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale ); + slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale ); glPopMatrix(); } @@ -464,11 +464,11 @@ void OGLTransitionImpl::displaySlidesRochade( double nTime, ::sal_Int32 glLeavin glEnable(GL_TEXTURE_2D); if( nTime > .5) { - displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); - displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); + displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); + displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); } else { - displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); - displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); + displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); + displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); } } @@ -1044,11 +1044,11 @@ void OGLTransitionImpl::displaySlidesFadeThroughBlack( double nTime, ::sal_Int32 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); if( nTime < 0.5 ) { - glColor4f( 1, 1, 1, 1 - nTime*2 ); - displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); + glColor4f( 1, 1, 1, 1 - nTime*2 ); + displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale ); } else { - glColor4f( 1, 1, 1, (nTime - 0.5)*2 ); - displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); + glColor4f( 1, 1, 1, (nTime - 0.5)*2 ); + displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale ); } glDisable(GL_BLEND); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx index b82f41cae656..9dbb9b660a5e 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx @@ -747,82 +747,82 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& #if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) if( mnGLXVersion >= 1.2999 && mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { - Sequence< Any > leaveArgs; - Sequence< Any > enterArgs; - if( (xLeavingSet->getFastPropertyValue( 1 ) >>= leaveArgs) && - (xEnteringSet->getFastPropertyValue( 1 ) >>= enterArgs) ) { - OSL_TRACE ("pixmaps available"); - - sal_Int32 depth(0); - - leaveArgs[0] >>= mbFreeLeavingPixmap; - enterArgs[0] >>= mbFreeEnteringPixmap; - leaveArgs[1] >>= maLeavingPixmap; - enterArgs[1] >>= maEnteringPixmap; - leaveArgs[2] >>= depth; - - int pixmapAttribs[] = { GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT, - GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGB_EXT, - GLX_MIPMAP_TEXTURE_EXT, True, - None }; - - - // sync so that we possibly get an pending XError, before we set our handler. - // this way we will not miss any error from other code - unx::glXWaitGL(); - XSync(GLWin.dpy, false); - - int (*oldHandler)(unx::Display* /*dpy*/, unx::XErrorEvent* /*evnt*/); - - // replace error handler temporarily - oldHandler = unx::XSetErrorHandler( oglErrorHandler ); - - errorTriggered = false; - LeavingPixmap = glXCreatePixmap( GLWin.dpy, GLWin.fbc, maLeavingPixmap, pixmapAttribs ); - - // sync so that we possibly get an XError - unx::glXWaitGL(); - XSync(GLWin.dpy, false); + Sequence< Any > leaveArgs; + Sequence< Any > enterArgs; + if( (xLeavingSet->getFastPropertyValue( 1 ) >>= leaveArgs) && + (xEnteringSet->getFastPropertyValue( 1 ) >>= enterArgs) ) { + OSL_TRACE ("pixmaps available"); + + sal_Int32 depth(0); + + leaveArgs[0] >>= mbFreeLeavingPixmap; + enterArgs[0] >>= mbFreeEnteringPixmap; + leaveArgs[1] >>= maLeavingPixmap; + enterArgs[1] >>= maEnteringPixmap; + leaveArgs[2] >>= depth; + + int pixmapAttribs[] = { GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT, + GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGB_EXT, + GLX_MIPMAP_TEXTURE_EXT, True, + None }; + + + // sync so that we possibly get an pending XError, before we set our handler. + // this way we will not miss any error from other code + unx::glXWaitGL(); + XSync(GLWin.dpy, false); + + int (*oldHandler)(unx::Display* /*dpy*/, unx::XErrorEvent* /*evnt*/); + + // replace error handler temporarily + oldHandler = unx::XSetErrorHandler( oglErrorHandler ); + + errorTriggered = false; + LeavingPixmap = glXCreatePixmap( GLWin.dpy, GLWin.fbc, maLeavingPixmap, pixmapAttribs ); + + // sync so that we possibly get an XError + unx::glXWaitGL(); + XSync(GLWin.dpy, false); + + if( !errorTriggered ) + mbUseLeavingPixmap = true; + else { + OSL_TRACE("XError triggered"); + if( mbFreeLeavingPixmap ) { + unx::XFreePixmap( GLWin.dpy, maLeavingPixmap ); + mbFreeLeavingPixmap = false; + } + errorTriggered = false; + } - if( !errorTriggered ) - mbUseLeavingPixmap = true; - else { - OSL_TRACE("XError triggered"); - if( mbFreeLeavingPixmap ) { - unx::XFreePixmap( GLWin.dpy, maLeavingPixmap ); - mbFreeLeavingPixmap = false; - } - errorTriggered = false; - } + EnteringPixmap = glXCreatePixmap( GLWin.dpy, GLWin.fbc, maEnteringPixmap, pixmapAttribs ); - EnteringPixmap = glXCreatePixmap( GLWin.dpy, GLWin.fbc, maEnteringPixmap, pixmapAttribs ); + // sync so that we possibly get an XError + unx::glXWaitGL(); + XSync(GLWin.dpy, false); - // sync so that we possibly get an XError - unx::glXWaitGL(); - XSync(GLWin.dpy, false); + OSL_TRACE("created glx pixmap %p and %p depth: %d", LeavingPixmap, EnteringPixmap, depth); + if( !errorTriggered ) + mbUseEnteringPixmap = true; + else { + OSL_TRACE("XError triggered"); + if( mbFreeEnteringPixmap ) { + unx::XFreePixmap( GLWin.dpy, maEnteringPixmap ); + mbFreeEnteringPixmap = false; + } + } - OSL_TRACE("created glx pixmap %p and %p depth: %d", LeavingPixmap, EnteringPixmap, depth); - if( !errorTriggered ) - mbUseEnteringPixmap = true; - else { - OSL_TRACE("XError triggered"); - if( mbFreeEnteringPixmap ) { - unx::XFreePixmap( GLWin.dpy, maEnteringPixmap ); - mbFreeEnteringPixmap = false; - } + // restore the error handler + unx::XSetErrorHandler( oldHandler ); } - - // restore the error handler - unx::XSetErrorHandler( oldHandler ); - } } #endif #endif if( !mbUseLeavingPixmap ) - LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect); + LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect); if( !mbUseEnteringPixmap ) - EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect); + EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect); // TODO #ifdef UNX -- cgit