vcl/skia/gdiimpl.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8ab30014e4e098e202b3bee571aa9d6bcdfa1c70
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Nov 17 07:32:47 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Nov 17 08:38:34 2021 +0100
loplugin:simplifybool
Change-Id: Ifb7c6d8a4506808b5f56492e692ef7172a367e26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125344
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index ac6f33ea7398..6a01601662a4 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1728,8 +1728,7 @@ sk_sp<SkImage>
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
// that they are the same size, or that one prefers a shader or doesn't
exist
// (i.e. avoid two images of different size).
bitmapReady = bitmap.GetSkImage(DirectImage::Yes) != nullptr;
- alphaBitmapReady
- = alphaBitmap ? alphaBitmap->GetAlphaSkImage(DirectImage::Yes) !=
nullptr : false;
+ alphaBitmapReady = alphaBitmap &&
alphaBitmap->GetAlphaSkImage(DirectImage::Yes) != nullptr;
if (bitmapReady && alphaBitmap && !alphaBitmapReady &&
!alphaBitmap->PreferSkShader())
bitmapReady = false;
if (alphaBitmapReady && !bitmapReady && bitmap.PreferSkShader())
