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

Caolán McNamara caolanm at redhat.com
Mon Mar 13 16:45:33 UTC 2017


 vcl/source/filter/wmf/winmtf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d46d83b2d95c8f32b5d350bc99cdc3bafd7f7dd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 13 15:54:30 2017 +0000

    ofz#846 timeout in wmf, can defer clip region if we don't do anything
    
    Change-Id: I8711bb5c676194d9b34df2584a31851dfcc901e6
    Reviewed-on: https://gerrit.libreoffice.org/35143
    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/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 5aae361..55d5002 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1342,11 +1342,11 @@ void WinMtfOutput::DrawPolyLine( tools::Polygon& rPolygon, bool bTo, bool bRecor
 
 void WinMtfOutput::DrawPolyBezier( tools::Polygon& rPolygon, bool bTo, bool bRecordPath )
 {
-    UpdateClipRegion();
-
     sal_uInt16 nPoints = rPolygon.GetSize();
     if ( ( nPoints >= 4 ) && ( ( ( nPoints - 4 ) % 3 ) == 0 ) )
     {
+        UpdateClipRegion();
+
         ImplMap( rPolygon );
         if ( bTo )
         {


More information about the Libreoffice-commits mailing list