summaryrefslogtreecommitdiff
path: root/include/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-06-06 16:31:03 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-06-07 01:25:02 +0200
commitb292a27698e85fd9d60c03613c3b0c67835c4dc1 (patch)
tree5a9e7ca0c8824475abeb528bedd79c5a28aebcbb /include/drawinglayer
parente2fcb76d04c3bbf578f06c1e7d30c1f987165470 (diff)
tdf#118029 crashtesting ooo24656-1.doc with --convert-to pdf
Revert "dont use GetMask in GeoTexSvxBitmapEx" This reverts commit 63e65d1743264dfa26d2aba615d71978e65784e8. Until we come up with something better Change-Id: I246468abdd5e3ee917143e251c2e95430d84f77b Reviewed-on: https://gerrit.libreoffice.org/55385 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/drawinglayer')
-rw-r--r--include/drawinglayer/texture/texture3d.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index fda5b45b1a2f..628edb1ec670 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
@@ -60,12 +60,16 @@ namespace drawinglayer
protected:
BitmapEx maBitmapEx;
Bitmap maBitmap; // Bitmap held within maBitmapEx, to exist during mpReadBitmap scope
+ Bitmap::ScopedReadAccess mpReadBitmap;
+ Bitmap maTransparence;
+ Bitmap::ScopedReadAccess mpReadTransparence;
basegfx::B2DPoint maTopLeft;
basegfx::B2DVector maSize;
double mfMulX;
double mfMulY;
bool mbIsAlpha : 1;
+ bool mbIsTransparent : 1;
// helpers
bool impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const;