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

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1cd7e2a4042b92123d8c94ef10b2e8baf7cfaafa
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Sep 29 09:52:05 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Sep 29 10:33:42 2020 +0200

    avoid crash if DrawTransformedBitmap() would mean empty Skia bitmap
    
    I can reproduce this sometimes with the document from tdf#136223.
    
    Change-Id: Ie6e57f18936a5de7f99ab01932be229625b737c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103596
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 0fff8776fe8f..ade34a6e8b01 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1484,6 +1484,8 @@ sk_sp<SkImage> SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
     // GPU-accelerated drawing with SkShader should be fast enough to not need caching.
     if (isGPU())
         return image;
+    if (targetSize.IsEmpty())
+        return image;
     if (alphaBitmap && alphaBitmap->IsFullyOpaqueAsAlpha())
         alphaBitmap = nullptr; // the alpha can be ignored
     // Probably not much point in caching of just doing a copy.