diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-15 17:18:28 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-16 11:33:48 +0200 |
| commit | ca8ca3c1a6bec44e41174dea340961ba00a1e976 (patch) | |
| tree | 1df472c625d28b662b93bf51eac61047b7dbaaad /vcl | |
| parent | 66f33819810e50ee39d468789edd4b6839d28d12 (diff) | |
vcl: aAlphaBitmap.ImplGetImpBitmap() seen as 0
Change-Id: I3f34f0315045d33ff6e498e24c0dacb0aabb0ff9
(cherry picked from commit 293dd731e9815c06ba8eca1fb83d86276103c820)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 2ae0236518a3..1ca04184fb32 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -670,11 +670,14 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r if (mpAlphaVDev) { Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aRelPt, aOutSz ) ); - SalBitmap* pSalAlphaBmp2 = aAlphaBitmap.ImplGetImpBitmap()->ImplGetSalBitmap(); - if (mpGraphics->BlendAlphaBitmap(aTR, *pSalSrcBmp, *pSalAlphaBmp, *pSalAlphaBmp2, this)) + if (aAlphaBitmap.ImplGetImpBitmap()) { - mpAlphaVDev->BlendBitmap(aTR, rAlpha); - return; + SalBitmap* pSalAlphaBmp2 = aAlphaBitmap.ImplGetImpBitmap()->ImplGetSalBitmap(); + if (mpGraphics->BlendAlphaBitmap(aTR, *pSalSrcBmp, *pSalAlphaBmp, *pSalAlphaBmp2, this)) + { + mpAlphaVDev->BlendBitmap(aTR, rAlpha); + return; + } } } else |