diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 10:24:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 12:37:35 +0100 |
| commit | 953a5cb1c8c750df24ed0316349a5916c384296d (patch) | |
| tree | 26a76707725fad73d9e71486f0723406bae52065 /vcl/source/helper | |
| parent | bca14a7126a8cea12eecd248ae84e3d07db9609b (diff) | |
move Bitmap::ScopedWriteAccess inside vcl
would have liked to make the AcquireWriteAccess methods DLLPRIVATE, but
they are needed by the workbench and testing code
Change-Id: I22497788eb68dfb84b7e542e5ef53322892a5274
Reviewed-on: https://gerrit.libreoffice.org/51310
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/source/helper')
| -rw-r--r-- | vcl/source/helper/canvastools.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index ba653f00ba35..02b0fc338d72 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -58,6 +58,7 @@ #include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> +#include <bitmapwriteaccess.hxx> using namespace ::com::sun::star; @@ -89,8 +90,8 @@ namespace vcl sal_Int32 nHeight, const rendering::IntegerBitmapLayout& rLayout, const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap, - Bitmap::ScopedWriteAccess& rWriteAcc, - Bitmap::ScopedWriteAccess& rAlphaAcc ) + BitmapScopedWriteAccess& rWriteAcc, + BitmapScopedWriteAccess& rAlphaAcc ) { rendering::IntegerBitmapLayout aCurrLayout; geometry::IntegerRectangle2D aRect; @@ -298,8 +299,8 @@ namespace vcl sal::static_int_cast<sal_uInt16>(1 << nAlphaDepth)) ); { // limit scoped access - Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); - Bitmap::ScopedWriteAccess pAlphaWriteAccess( nAlphaDepth ? aAlpha.AcquireWriteAccess() : nullptr, + BitmapScopedWriteAccess pWriteAccess( aBitmap ); + BitmapScopedWriteAccess pAlphaWriteAccess( nAlphaDepth ? aAlpha.AcquireWriteAccess() : nullptr, aAlpha ); ENSURE_OR_THROW(pWriteAccess.get() != nullptr, |