[Libreoffice-commits] core.git: vcl/skia

[Mike Kaganski (via logerrit)]

 vcl/skia/salbmp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5ca28013a5ceb1b633fd4df8f9451778be5f1734
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Aug 17 17:33:22 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Aug 17 22:27:44 2023 +0200

    Skia: Avoid assertion failure inside ProcessAndBlurAlphaMask
    
    As seen opening https://bugs.documentfoundation.org/attachment.cgi?id=182024
    from tdf#150610.
    
    The upscale is pending, and SkiaSalBitmap::mImage is empty here;
    EnsureBitmapData call works correctly in this case.
    
    Change-Id: I71575b09b3b4513b06b55271f6440688785cfb84
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155792
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index b5da2e4bd432..eac913671384 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -235,7 +235,8 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode 
nMode)
             // set otherwise exporting the following animated .png image will
             // fail:
             //   https://bugs.documentfoundation.org/attachment.cgi?id=188792
-            if ((mPixelsSize != mSize || getenv("SAL_FORCE_HIDPI_SCALING")) && 
mImage)
+            static const bool bForceHiDPIScaling = 
getenv("SAL_FORCE_HIDPI_SCALING") != nullptr;
+            if (mPixelsSize != mSize || (bForceHiDPIScaling && mImage))
                 EnsureBitmapData();
             assert(mPixelsSize == mSize);
             break;