vcl/skia/salbmp.cxx | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 2c84920182ee18d0cff97637bc7f20facc5f29cd
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Mar 15 16:56:44 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Mar 16 12:55:53 2021 +0100
with mEraseColorSet, there should be no pixel buffer
Change-Id: Icc39ce0516f6cb058cb11e20420a387a913a81e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112544
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 83dd16950eaa..c8abfb64252b 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -1024,15 +1024,10 @@ void SkiaSalBitmap::EnsureBitmapData()
if (mEraseColorSet)
{
SkiaZone zone;
- if (mPixelsSize != mSize)
- {
- mPixelsSize = mSize;
- ComputeScanlineSize();
- mBuffer.reset();
- }
+ assert(mPixelsSize == mSize);
+ assert(!mBuffer);
mScaleQuality = BmpScaleFlag::BestQuality;
- if (!mBuffer)
- CreateBitmapData();
+ CreateBitmapData();
// Unset now, so that repeated call will return mBuffer.
mEraseColorSet = false;
PerformErase();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
