diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 16:37:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-21 08:19:31 +0200 |
commit | ec665e3e898e733c9f602b21046079e569b58568 (patch) | |
tree | d557ec77afb9c7a19c4edf46325a403ef1a05d10 /canvas | |
parent | 30d5569dcf46ddd84a85eb9bd38e18e59cfd2c9d (diff) |
use more OutputDevice::GetBitmapEx
instead of GetBitmap
Change-Id: Ib43cfaf3c91968d623e5a24f44539368da28d36f
Reviewed-on: https://gerrit.libreoffice.org/55190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 6 | ||||
-rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 6 | ||||
-rw-r--r-- | canvas/source/vcl/devicehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/spritedevicehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 63c89c5fcb9d..18cf4d60a452 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -241,8 +241,8 @@ namespace cairocanvas const ::Point aEmptyPoint; bool bOldMap( mpRefDevice->IsMapModeEnabled() ); mpRefDevice->EnableMapMode( false ); - const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel())); - WriteDIB(aTempBitmap, aStream, false, true); + const ::BitmapEx aTempBitmap(mpRefDevice->GetBitmapEx(aEmptyPoint, mpRefDevice->GetOutputSizePixel())); + WriteDIB(aTempBitmap, aStream, false); mpRefDevice->EnableMapMode( bOldMap ); ++nFilePostfixCount; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index a6661c5d5609..2d4a29e04ace 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -901,7 +901,7 @@ namespace vclcanvas const Point aEmptyPoint(0,0); const Size aBmpSize( rOutDev.GetOutputSizePixel() ); - Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) ); + BitmapEx aBitmap( rOutDev.GetBitmapEx(aEmptyPoint, aBmpSize) ); aBitmap.Scale( vcl::unotools::sizeFromRealSize2D(newSize), beFast ? BmpScaleFlag::Default : BmpScaleFlag::BestQuality ); @@ -927,8 +927,8 @@ namespace vclcanvas rOutDev.EnableMapMode( false ); rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); - Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(), - aRect.GetSize()) ); + Bitmap aBitmap( rOutDev.GetBitmapEx(aRect.TopLeft(), + aRect.GetSize()).GetBitmap() ); Bitmap::ScopedReadAccess pReadAccess( aBitmap ); diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index c65e73fd660a..c29fa6f3f12d 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -953,8 +953,8 @@ namespace vclcanvas // output VDev content alpha-blended to // target position. const ::Point aEmptyPoint; - Bitmap aContentBmp( - pVDev->GetBitmap( aEmptyPoint, + BitmapEx aContentBmp( + pVDev->GetBitmapEx( aEmptyPoint, pVDev->GetOutputSizePixel() ) ); sal_uInt8 nCol( static_cast< sal_uInt8 >( @@ -962,7 +962,7 @@ namespace vclcanvas AlphaMask aAlpha( pVDev->GetOutputSizePixel(), &nCol ); - BitmapEx aOutputBmpEx( aContentBmp, aAlpha ); + BitmapEx aOutputBmpEx( aContentBmp.GetBitmap(), aAlpha ); rOutDev.DrawBitmapEx( aPolygonDeviceRect.TopLeft(), aOutputBmpEx ); diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index b90cbdabb8b7..4f5b2649a122 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -208,7 +208,7 @@ namespace vclcanvas OutputDevice& rOutDev = mpOutDev->getOutDev(); bool bOldMap( rOutDev.IsMapModeEnabled() ); rOutDev.EnableMapMode( false ); - WriteDIB(rOutDev.GetBitmap(aEmptyPoint, rOutDev.GetOutputSizePixel()), aStream, false, true); + WriteDIB(rOutDev.GetBitmapEx(aEmptyPoint, rOutDev.GetOutputSizePixel()), aStream, false); rOutDev.EnableMapMode( bOldMap ); ++nFilePostfixCount; diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index 021abba778d8..eb9dd0972b98 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -120,7 +120,7 @@ namespace vclcanvas const ::Point aEmptyPoint; mpBackBuffer->getOutDev().EnableMapMode( false ); mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw ); - WriteDIB(mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false, true); + WriteDIB(mpBackBuffer->getOutDev().GetBitmapEx(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false); } ++nFilePostfixCount; diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 9424d4ec54b9..0af108c84306 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -129,7 +129,7 @@ namespace vclcanvas if( bNeedBitmapUpdate ) { - Bitmap aBmp( mpBackBuffer->getOutDev().GetBitmap( aEmptyPoint, + BitmapEx aBmp( mpBackBuffer->getOutDev().GetBitmapEx( aEmptyPoint, aOutputSize ) ); if( isContentFullyOpaque() ) @@ -144,7 +144,7 @@ namespace vclcanvas { // sprite content might contain alpha, create // BmpEx, then. - Bitmap aMask( mpBackBufferMask->getOutDev().GetBitmap( aEmptyPoint, + BitmapEx aMask( mpBackBufferMask->getOutDev().GetBitmapEx( aEmptyPoint, aOutputSize ) ); // bitmasks are much faster than alphamasks on some platforms @@ -163,7 +163,7 @@ namespace vclcanvas // Note: since we retrieved aBmp and aMask // directly from an OutDev, it's already a // 'display bitmap' on windows. - maContent = BitmapEx( aBmp, aMask ); + maContent = BitmapEx( aBmp.GetBitmap(), aMask.GetBitmap() ); } } |