vcl/source/outdev/bitmapex.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 12df2ac0b0a4cba7ed8977f837e9bb8840ba0aa0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Apr 2 11:52:17 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Apr 2 14:20:44 2025 +0200
dont draw to alpha layer if draw to bitmap layer fails
Change-Id: I9ae4e552bf16dfb53b7d0626d66252e4e8929698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183616
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx
index 3024b7ba86ed..2fcc8792474c 100644
--- a/vcl/source/outdev/bitmapex.cxx
+++ b/vcl/source/outdev/bitmapex.cxx
@@ -213,8 +213,6 @@ bool OutputDevice::DrawTransformBitmapExDirect(
{
assert(!is_double_buffered_window());
- bool bDone = false;
-
// try to paint directly
const basegfx::B2DPoint aNull(aFullTransform * basegfx::B2DPoint(0.0,
0.0));
const basegfx::B2DPoint aTopX(aFullTransform * basegfx::B2DPoint(1.0,
0.0));
@@ -234,14 +232,15 @@ bool OutputDevice::DrawTransformBitmapExDirect(
SalBitmap* pSalAlphaBmp =
aAlphaBitmap.GetBitmap().ImplGetSalBitmap().get();
- bDone = mpGraphics->DrawTransformedBitmap(
+ if (!mpGraphics->DrawTransformedBitmap(
aNull,
aTopX,
aTopY,
*pSalSrcBmp,
pSalAlphaBmp,
fAlpha,
- *this);
+ *this))
+ return false;
if (mpAlphaVDev)
{
@@ -251,7 +250,7 @@ bool OutputDevice::DrawTransformBitmapExDirect(
mpAlphaVDev->DrawTransformBitmapExDirect(aFullTransform,
BitmapEx(aAlpha.GetBitmap(), aAlphaBitmap));
}
- return bDone;
+ return true;
};
bool OutputDevice::TransformAndReduceBitmapExToTargetRange(
