diff options
Diffstat (limited to 'canvas/source/directx/dx_spritecanvashelper.cxx')
| -rw-r--r-- | canvas/source/directx/dx_spritecanvashelper.cxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 30bf9040634c..708f98e2933c 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/scopeguard.hxx> +#include <comphelper/scopeguard.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> @@ -44,7 +44,7 @@ #include "dx_spritecanvashelper.hxx" #include "dx_canvascustomsprite.hxx" -#if defined(DX_DEBUG_IMAGES) +#if defined(DX_DEBUG_IMAGES) # if OSL_DEBUG_LEVEL > 0 # include <imdebug.h> # undef min @@ -58,9 +58,9 @@ namespace dxcanvas { namespace { - void repaintBackground( const ::basegfx::B2DRange& rUpdateArea, - const ::basegfx::B2IRange& rOutputArea, - const DXSurfaceBitmapSharedPtr& rBackBuffer ) + void repaintBackground( const ::basegfx::B2DRange& rUpdateArea, + const ::basegfx::B2IRange& rOutputArea, + const DXSurfaceBitmapSharedPtr& rBackBuffer ) { // TODO(E1): Use numeric_cast to catch overflow here ::basegfx::B2IRange aActualArea( 0, 0, @@ -120,11 +120,11 @@ namespace dxcanvas } void SpriteCanvasHelper::init( SpriteCanvas& rParent, - ::canvas::SpriteRedrawManager& rManager, - const IDXRenderModuleSharedPtr& rRenderModule, - const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy, - const DXSurfaceBitmapSharedPtr& rBackBuffer, - const ::basegfx::B2ISize& rOutputOffset ) + ::canvas::SpriteRedrawManager& rManager, + const IDXRenderModuleSharedPtr& rRenderModule, + const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy, + const DXSurfaceBitmapSharedPtr& rBackBuffer, + const ::basegfx::B2ISize& rOutputOffset ) { // init base setDevice( rParent ); @@ -136,7 +136,7 @@ namespace dxcanvas mpSurfaceProxy = rSurfaceProxy; mpBackBuffer = rBackBuffer; } - + void SpriteCanvasHelper::disposing() { if(mpRenderModule) @@ -148,17 +148,17 @@ namespace dxcanvas mpSpriteSurface = NULL; // forward to base - CanvasHelper::disposing(); + CanvasHelper::disposing(); } - uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( + uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( const uno::Reference< rendering::XAnimation >& /*animation*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); } - uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( - const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, + uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( + const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, sal_Int8 /*interpolationMode*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); @@ -169,8 +169,8 @@ namespace dxcanvas if( !mpRedrawManager ) return uno::Reference< rendering::XCustomSprite >(); // we're disposed - return uno::Reference< rendering::XCustomSprite >( - new CanvasCustomSprite( spriteSize, + return uno::Reference< rendering::XCustomSprite >( + new CanvasCustomSprite( spriteSize, mpSpriteSurface, mpRenderModule, mpSurfaceProxy, @@ -186,7 +186,7 @@ namespace dxcanvas sal_Bool bUpdateAll, bool& io_bSurfaceDirty ) { - if( !mpRedrawManager || + if( !mpRedrawManager || !mpRenderModule || !mpBackBuffer ) { @@ -197,7 +197,7 @@ namespace dxcanvas # if OSL_DEBUG_LEVEL > 0 mpBackBuffer->imageDebugger(); # endif -#endif +#endif // store current output area (need to tunnel that to the // background, scroll, opaque and general sprite repaint @@ -208,8 +208,8 @@ namespace dxcanvas maUpdateRect.reset(); // TODO(P1): Might be worthwile to track areas of background - // changes, too. - + // changes, too. + // TODO(P2): Might be worthwhile to use page-flipping only if // a certain percentage of screen area has changed - and // compose directly to the front buffer otherwise. @@ -259,7 +259,7 @@ namespace dxcanvas // change record vector must be cleared, for the next turn of // rendering and sprite changing mpRedrawManager->clearChangeRecords(); - + io_bSurfaceDirty = false; return sal_True; @@ -276,8 +276,8 @@ namespace dxcanvas mpBackBuffer ); } - void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& /*rMoveStart*/, - const ::basegfx::B2DRange& rMoveEnd, + void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& /*rMoveStart*/, + const ::basegfx::B2DRange& rMoveEnd, const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea ) { ENSURE_OR_THROW( mpRenderModule && @@ -322,11 +322,11 @@ namespace dxcanvas static_cast<sal_Int32>(maScrapRect.getWidth()), static_cast<sal_Int32>(maScrapRect.getHeight()) ); aActualArea.intersect( fround( rUpdateArea.maTotalBounds ) ); - + // add given update area to the 'blit to foreground' rect maUpdateRect.expand( aActualArea ); } - + void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea, const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { @@ -345,12 +345,12 @@ namespace dxcanvas ::basegfx::B2IRange aActualArea( 0, 0, static_cast<sal_Int32>(maScrapRect.getWidth()), static_cast<sal_Int32>(maScrapRect.getHeight()) ); - aActualArea.intersect( fround( rTotalArea ) ); - + aActualArea.intersect( fround( rTotalArea ) ); + // add given update area to the 'blit to foreground' rect maUpdateRect.expand( aActualArea ); } - + void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rTotalArea, const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { @@ -376,7 +376,7 @@ namespace dxcanvas ::std::for_each( rSortedUpdateSprites.begin(), rSortedUpdateSprites.end(), ::std::ptr_fun( &spriteRedrawStub ) ); - + // add given update area to the 'blit to foreground' rect maUpdateRect.expand( aActualArea ); } |