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

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

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

New commits:
commit 8a930585b102eb9b63f7e43b646a8f07ad780ac3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Aug 31 11:58:36 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Sep 1 18:52:00 2020 +0200

    do not try to merge a single polypolygon (tdf#136240)
    
    Change-Id: Idad860288baf736caeefe9883d12ab50cca37dff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101702
    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 b80fcc301d8a..a0299160496c 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -841,8 +841,11 @@ void SkiaSalGraphicsImpl::checkPendingDrawing()
         std::swap(polygons, mLastPolyPolygonInfo.polygons);
         double transparency = mLastPolyPolygonInfo.transparency;
         mLastPolyPolygonInfo.bounds.reset();
-        basegfx::B2DPolyPolygon merged = basegfx::utils::mergeToSinglePolyPolygon(polygons);
-        performDrawPolyPolygon(merged, transparency, true);
+        if (polygons.size() == 1)
+            performDrawPolyPolygon(polygons.front(), transparency, true);
+        else
+            performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons), transparency,
+                                   true);
     }
 }