[Libreoffice-commits] core.git: emfio/source svx/source

Caolán McNamara caolanm at redhat.com
Mon Jan 29 16:59:47 UTC 2018


 emfio/source/reader/mtftools.cxx |    2 +-
 svx/source/svdraw/svdobj.cxx     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0c7d0f718bdaf86c1f927a3063702002a28beda7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 29 13:22:18 2018 +0000

    ofz: solveCrossovers performance is abysmal on large polygons
    
    just give up on it for fuzzing purposes
    
    Change-Id: I8d91fa547d83bc2f28454812280b0a7054e05b62
    Reviewed-on: https://gerrit.libreoffice.org/48835
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 44316fd29d0f..1b880b01cc2e 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -924,7 +924,7 @@ namespace emfio
 
     void MtfTools::UpdateClipRegion()
     {
-        if ( mbClipNeedsUpdate )
+        if (mbClipNeedsUpdate && !utl::ConfigManager::IsFuzzing())
         {
             mbClipNeedsUpdate = false;
             mbComplexClip = false;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index a582eda43e54..f2008be71cb3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -49,6 +49,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/helpers.hxx>
 #include <tools/line.hxx>
+#include <unotools/configmgr.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
@@ -2369,7 +2370,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
             }
 
             // check for fill rsults
-            if(!aExtractedLineFills.empty())
+            if (!aExtractedLineFills.empty() && !utl::ConfigManager::IsFuzzing())
             {
                 // merge to a single tools::PolyPolygon (OR)
                 aMergedLineFillPolyPolygon = basegfx::utils::mergeToSinglePolyPolygon(aExtractedLineFills);


More information about the Libreoffice-commits mailing list