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/workben | |
| 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/workben')
| -rw-r--r-- | vcl/workben/svptest.cxx | 1 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 30aa4e0e5d14..190af5689bf3 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -35,6 +35,7 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/metric.hxx> #include <vcl/vclptr.hxx> +#include <bitmapwriteaccess.hxx> #include <rtl/ustrbuf.hxx> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index e133c02dc49a..841cc2103cd8 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -45,6 +45,7 @@ #include <vcl/help.hxx> #include <vcl/menu.hxx> #include <vcl/ImageTree.hxx> +#include <bitmapwriteaccess.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -1301,8 +1302,8 @@ public: AlphaMask aMask(aSrc.GetSizePixel()); Bitmap aRecovered(aSrc.GetSizePixel(), 24); { - AlphaMask::ScopedWriteAccess pMaskAcc(aMask); - Bitmap::ScopedWriteAccess pRecAcc(aRecovered); + AlphaScopedWriteAccess pMaskAcc(aMask); + BitmapScopedWriteAccess pRecAcc(aRecovered); Bitmap::ScopedReadAccess pAccW(aWhiteBmp); // a * pix + (1-a) Bitmap::ScopedReadAccess pAccB(aBlackBmp); // a * pix + 0 int nSizeX = aSrc.GetSizePixel().Width(); |