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/gdi/dibtools.cxx | |
| 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/gdi/dibtools.cxx')
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 68d946753728..de8615226492 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -30,6 +30,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/outdev.hxx> +#include <bitmapwriteaccess.hxx> #include <memory> @@ -955,7 +956,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL const Size aSizePixel(aHeader.nWidth, aHeader.nHeight); AlphaMask aNewBmpAlpha; - AlphaMask::ScopedWriteAccess pAccAlpha; + AlphaScopedWriteAccess pAccAlpha; bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32); if (bAlphaPossible) @@ -977,7 +978,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL if (bAlphaPossible) { aNewBmpAlpha = AlphaMask(aSizePixel); - pAccAlpha = AlphaMask::ScopedWriteAccess(aNewBmpAlpha); + pAccAlpha = AlphaScopedWriteAccess(aNewBmpAlpha); } sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount)); @@ -994,7 +995,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL } Bitmap aNewBmp(aSizePixel, nBitCount, pPal); - Bitmap::ScopedWriteAccess pAcc(aNewBmp); + BitmapScopedWriteAccess pAcc(aNewBmp); if (!pAcc) return false; if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight) |