diff options
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/opengl/ogl_canvasbitmap.cxx | 9 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_canvasbitmap.hxx | 4 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx index 08e76a5c1c1e..69d049f0c391 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.cxx +++ b/canvas/source/opengl/ogl_canvasbitmap.cxx @@ -22,10 +22,8 @@ namespace oglcanvas { CanvasBitmap::CanvasBitmap( const geometry::IntegerSize2D& rSize, const SpriteCanvasRef& rDevice, - SpriteDeviceHelper& rDeviceHelper, - bool bHasAlpha ) : - mpDevice( rDevice ), - mbHasAlpha( bHasAlpha ) + SpriteDeviceHelper& rDeviceHelper ) : + mpDevice( rDevice ) { ENSURE_OR_THROW( mpDevice.is(), "CanvasBitmap::CanvasBitmap(): Invalid surface or device" ); @@ -34,8 +32,7 @@ namespace oglcanvas } CanvasBitmap::CanvasBitmap( const CanvasBitmap& rSrc ) : - mpDevice( rSrc.mpDevice ), - mbHasAlpha( rSrc.mbHasAlpha ) + mpDevice( rSrc.mpDevice ) { maCanvasHelper = rSrc.maCanvasHelper; } diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index 89482120c26b..3d5954e4c723 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -49,8 +49,7 @@ namespace oglcanvas */ CanvasBitmap( const css::geometry::IntegerSize2D& rSize, const SpriteCanvasRef& rDevice, - SpriteDeviceHelper& rDeviceHelper, - bool bHasAlpha ); + SpriteDeviceHelper& rDeviceHelper ); /** Create verbatim copy (including all recorded actions) */ @@ -68,7 +67,6 @@ namespace oglcanvas raw pointer (without refcounting) */ SpriteCanvasRef mpDevice; - bool mbHasAlpha; }; } diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 46535fc9a409..3f4c8a7414b5 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -218,8 +218,7 @@ namespace oglcanvas return uno::Reference< rendering::XBitmap >( new CanvasBitmap( size, mpSpriteCanvas, - *this, - false ) ); + *this ) ); } uno::Reference< rendering::XVolatileBitmap > SpriteDeviceHelper::createVolatileBitmap( @@ -240,8 +239,7 @@ namespace oglcanvas return uno::Reference< rendering::XBitmap >( new CanvasBitmap( size, mpSpriteCanvas, - *this, - true ) ); + *this ) ); } uno::Reference< rendering::XVolatileBitmap > SpriteDeviceHelper::createVolatileAlphaBitmap( |