vcl/skia/salbmp.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 6453e424f6da3a45745746fac1e8d8e5fb7c7538
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Feb 17 15:52:12 2020 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Feb 19 14:24:13 2020 +0100
BitmapAccessMode::Info does not need bitmap data
This was needlessly bailing out if the bitmap data wasn't ready
but it wasn't necessary either.
Change-Id: Ia2b78920f614f71630d31c353091c807d1db2af6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89009
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index c354b1e34e4b..6522709a5ecd 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -232,15 +232,17 @@ BitmapBuffer*
SkiaSalBitmap::AcquireBuffer(BitmapAccessMode nMode)
{
case BitmapAccessMode::Write:
EnsureBitmapUniqueData();
+ if (mBitmap.isNull() && !mBuffer)
+ return nullptr;
break;
case BitmapAccessMode::Read:
EnsureBitmapData();
+ if (mBitmap.isNull() && !mBuffer)
+ return nullptr;
break;
- default:
+ case BitmapAccessMode::Info:
break;
}
- if (mBitmap.isNull() && !mBuffer)
- return nullptr;
#ifdef DBG_UTIL
// BitmapWriteAccess stores also a copy of the palette and it can
// be modified, so concurrent reading of it might result in
inconsistencies.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
