[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

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

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

New commits:
commit ad438942a43141f8530e70552dda06df2a371c9d
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Aug 31 11:58:36 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 2 10:14:37 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>
    (cherry picked from commit 8a930585b102eb9b63f7e43b646a8f07ad780ac3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101858
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 4ae57d70ea66..9eefb5e814d8 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -833,8 +833,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);
     }
 }