summaryrefslogtreecommitdiff
path: root/include/drawinglayer
diff options
context:
space:
mode:
authorMark Page <aptitude@btconnect.com>2016-12-05 14:03:12 +0000
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-06 18:17:56 +0000
commitd08db164dcac8f6aa88158b2848abb5ad66a4052 (patch)
treebacb0e7b183115e3b00bd4c375b37908264f0f87 /include/drawinglayer
parent0c6c37cb01c242ad9324bc91ac15c974529086c5 (diff)
Change Read/Write access to Scoped Read/Write access
Change-Id: Idbe8e393b64f2a151e20c1851d7c14fa161acf97 Reviewed-on: https://gerrit.libreoffice.org/31635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/drawinglayer')
-rw-r--r--include/drawinglayer/texture/texture3d.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index 70aefdc9a924..489c631b0b27 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
@@ -60,9 +60,10 @@ namespace drawinglayer
{
protected:
BitmapEx maBitmapEx;
- BitmapReadAccess* mpReadBitmap;
+ Bitmap maBitmap; // Bitmap held within maBitmapEx, to exist during mpReadBitmap scope
+ Bitmap::ScopedReadAccess mpReadBitmap;
Bitmap maTransparence;
- BitmapReadAccess* mpReadTransparence;
+ Bitmap::ScopedReadAccess mpReadTransparence;
basegfx::B2DPoint maTopLeft;
basegfx::B2DVector maSize;
double mfMulX;