diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 10:35:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-01 12:09:04 +0000 |
| commit | d9262e19c942f2719bfa7de3a5059e4f6e0039c6 (patch) | |
| tree | 8380b7cd97241e4fe9b5f1feae0e45132d267b07 /vcl | |
| parent | 03899e1284db150d2da78b725aba7180147123c4 (diff) | |
ofz: timeout loading emf with move clip record
Change-Id: Id5d60f0037873598e1447b063e66e9c29840587c
Reviewed-on: https://gerrit.libreoffice.org/34740
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf | bin | 0 -> 8700 bytes | |||
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 9 |
2 files changed, 2 insertions, 7 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf b/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf Binary files differnew file mode 100644 index 000000000000..ef4c6a0097fd --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/emf/fail/slow-moveclip-1.emf diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index d51db44b11ae..028495d10638 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -78,14 +78,9 @@ void WinMtfClipPath::setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_In void WinMtfClipPath::moveClipRegion( const Size& rSize ) { - // what a weird concept. emulate, don't want this in B2DClipState - // API - basegfx::B2DPolyPolygon aCurrClip=maClip.getClipPoly(); basegfx::B2DHomMatrix aTranslate; aTranslate.translate(rSize.Width(), rSize.Height()); - - aCurrClip.transform(aTranslate); - maClip = basegfx::tools::B2DClipState( aCurrClip ); + maClip.transform(aTranslate); } void WinMtfClipPath::setDefaultClipPath() @@ -902,7 +897,7 @@ void WinMtfOutput::UpdateClipRegion() { //this makes cases like tdf#45820 work in reasonable time, and I feel in theory should //be just fine. In practice I see the output is different so needs work before its the - //default, but for file fuzzing it should good enough + //default, but for file fuzzing it should be good enough if (mbComplexClip) { mpGDIMetaFile->AddAction( |