diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-28 08:53:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-29 01:11:17 +0200 |
| commit | 9ae5752b80ceb269d5739287ad5d0357c47ee85c (patch) | |
| tree | 574dca29032a29a679c3b90313e6a52eca1a8d7c /include/vcl | |
| parent | bd6cdb578ad7e9697579888ff254a1f6809ae103 (diff) | |
ofz#7165 set a recursion limit for svm in svm
Change-Id: Id9089986012588690b6d5e33cd71d094ef2357dd
Reviewed-on: https://gerrit.libreoffice.org/51982
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 'include/vcl')
| -rw-r--r-- | include/vcl/gdimtf.hxx | 9 | ||||
| -rw-r--r-- | include/vcl/metaact.hxx | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index e7372e159236..07fd8444492e 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -38,7 +38,7 @@ namespace tools { class PolyPolygon; } class Gradient; - +struct ImplMetaReadData; #define GDI_METAFILE_END (size_t(0xFFFFFFFF)) @@ -52,6 +52,9 @@ enum class MtfConversion typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); +VCL_DLLPUBLIC SvStream& ReadGDIMetaFile(SvStream& rIStm, GDIMetaFile& rGDIMetaFile, ImplMetaReadData* pReadData = nullptr); +VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ); + class VCL_DLLPUBLIC GDIMetaFile final { private: @@ -185,8 +188,8 @@ public: // Stream-operators write (still) the old format // and read both the old and the new format - friend VCL_DLLPUBLIC SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ); - friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ); + friend VCL_DLLPUBLIC SvStream& ReadGDIMetaFile(SvStream& rIStm, GDIMetaFile& rGDIMetaFile, ImplMetaReadData* pReadData); + friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile(SvStream& rOStm, const GDIMetaFile& rGDIMetaFile); /// Creates an antialiased thumbnail bool CreateThumbnail(BitmapEx& rBitmapEx, diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 930261b5866f..8deb04222fc8 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -43,9 +43,11 @@ enum class DrawTextFlags; struct ImplMetaReadData { rtl_TextEncoding meActualCharSet; + int mnParseDepth; - ImplMetaReadData() : - meActualCharSet( RTL_TEXTENCODING_ASCII_US ) + ImplMetaReadData() + : meActualCharSet(RTL_TEXTENCODING_ASCII_US) + , mnParseDepth(0) {} }; |