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

[Bartosz Kosiorek (via logerrit)]

 emfio/source/reader/emfreader.cxx |   39 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 363b98b268f317e7f2f9af392085856b938fb5f9
Author:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
AuthorDate: Thu Jun 10 15:54:38 2021 +0200
Commit:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
CommitDate: Thu Jun 10 18:49:52 2021 +0200

    EMF tdf#142745 Improve performance of FILLRGN, PAINTRGN, EXTSELECTCLIPRGN
    
    With previous implementation, during reading of rectangles
    the optimizations were made after reading every single
    rectangle. This was causing performance issues, with many
    rectangles (eg. 2500 rectangles).
    
    With this commit, the optimization is made after reading all
    rectangles. It is improving performance of FILLRGN, PAINTRGN and
     EXTSELECTCLIPRGN records.
    
    Change-Id: I1b8b844efddd08e9bf6f6726c3fdf213a629883f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116996
    Tested-by: Jenkins
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index dc5941493058..064a8b0334c9 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -16,7 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <emfreader.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -329,7 +330,7 @@ SvStream& operator>>(SvStream& rInStream, BLENDFUNCTION& rBlendFun)
     return rInStream;
 }
 
-bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen )
+bool ImplReadRegion( basegfx::B2DPolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen )
 {
     if (nLen < 32) // 32 bytes - Size of RegionDataHeader
         return false;
@@ -350,7 +351,7 @@ bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3
     if (!rStream.good() || nCountRects == 0 || nType != RDH_RECTANGLES)
         return false;
 
-    SAL_INFO("emfio", "\t\tLeft: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom);
+    SAL_INFO("emfio", "\t\tBounds Left: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom);
 
     nLen -= 32;
 
@@ -360,23 +361,18 @@ bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3
     if (nLen < nSize)
         return false;
 
-    bool bIsFuzzing = utl::ConfigManager::IsFuzzing();
-
     for (sal_uInt32 i = 0; i < nCountRects; ++i)
     {
         rStream.ReadInt32(nLeft);
         rStream.ReadInt32(nTop);
         rStream.ReadInt32(nRight);
         rStream.ReadInt32(nBottom);
-
-        SAL_INFO("emfio", "\t\tLeft: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom);
-
-        if (bIsFuzzing && i) // GetUnion is super slow, when fuzzing skip after first rect
-            continue;
-
-        tools::PolyPolygon aPolyPolyOr1(tools::Polygon(tools::Rectangle(nLeft, nTop, nRight, nBottom)));
-        rPolyPoly.GetUnion(aPolyPolyOr1, rPolyPoly);
+        rPolyPoly.append( basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( nLeft, nTop, nRight, nBottom ) ) );
+        SAL_INFO("emfio", "\t\t" << i << " Left: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom);
     }
+    rPolyPoly = basegfx::utils::solveCrossovers(rPolyPoly);
+    rPolyPoly = basegfx::utils::stripNeutralPolygons(rPolyPoly);
+    rPolyPoly = basegfx::utils::stripDispensablePolygons(rPolyPoly);
     return true;
 }
 
@@ -1461,10 +1457,11 @@ namespace emfio
                             }
                             else
                             {
-                                tools::PolyPolygon aPolyPoly;
+                                basegfx::B2DPolyPolygon aPolyPoly;
                                 if (cbRgnData)
                                     ImplReadRegion(aPolyPoly, *mpInputStream, nRemainingRecSize);
-                                SetClipPath(aPolyPoly, nClippingMode, false);
+                                const tools::PolyPolygon aPolyPolygon(aPolyPoly);
+                                SetClipPath(aPolyPolygon, nClippingMode, false);
                             }
                         }
                     }
@@ -1968,7 +1965,7 @@ namespace emfio
                         else
                         {
                             sal_uInt32 nRgnDataSize;
-                            tools::PolyPolygon aPolyPoly;
+                            basegfx::B2DPolyPolygon aPolyPoly;
                             mpInputStream->SeekRel(16);  // RectL bounds
                             mpInputStream->ReadUInt32( nRgnDataSize ).ReadUInt32( nIndex );
                             nRemainingRecSize -= 24;
@@ -1977,7 +1974,8 @@ namespace emfio
                             {
                                 Push();
                                 SelectObject( nIndex );
-                                DrawPolyPolygon( aPolyPoly );
+                                tools::PolyPolygon aPolyPolygon(aPolyPoly);
+                                DrawPolyPolygon( aPolyPolygon );
                                 Pop();
                             }
                         }
@@ -1992,13 +1990,16 @@ namespace emfio
                         else
                         {
                             sal_uInt32 nRgnDataSize;
-                            tools::PolyPolygon aPolyPoly;
+                            basegfx::B2DPolyPolygon aPolyPoly;
                             mpInputStream->SeekRel(16); // Skipping RectL bounds
                             mpInputStream->ReadUInt32( nRgnDataSize );
                             nRemainingRecSize -= 20;
 
                             if (ImplReadRegion(aPolyPoly, *mpInputStream, nRemainingRecSize))
-                                DrawPolyPolygon( aPolyPoly );
+                            {
+                                tools::PolyPolygon aPolyPolygon(aPolyPoly);
+                                DrawPolyPolygon( aPolyPolygon );
+                            }
                         }
                     }
                     break;