vcl/source/outdev/bitmap.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 37421677cea4969ffecdeb2a58488bae22f81782 Author: Noel Grandin <[email protected]> AuthorDate: Wed Aug 2 11:57:20 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Aug 2 13:06:20 2023 +0200 tdf#156514 Check spelling red underlines are gone Regression from commit af34f4ea62d8aabbab5d4028034aa2482c16fe8a Author: Noel Grandin <[email protected]> Date: Thu Jul 6 10:52:07 2023 +0200 avoid skia assert and slow-path Change-Id: Ib81c7d341a88e72fb0a48a39703485261ac6679c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155217 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index e487ac6802af..ef11ad97b79f 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -314,8 +314,6 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r if (aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty()) return; - if (ImplLogicToDevicePixel(aOutSz).IsEmpty()) // nothing to draw - return; { Point aRelPt = aOutPt + Point(mnOutOffX, mnOutOffY); @@ -341,6 +339,8 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r // try to blend the alpha bitmap with the alpha virtual device if (mpAlphaVDev) { + if (ImplLogicToDevicePixel(aOutSz).IsEmpty()) // nothing to draw + return; Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aRelPt, aOutSz ) ); if (SalBitmap* pSalAlphaBmp2 = aAlphaBitmap.ImplGetSalBitmap().get()) {
