X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1dc9f8394c1488ad8e7d945e6f943f7b34554ce..a703012aedeb8064c8294c6aeeea95e6950ad170:/include/wx/zstream.h diff --git a/include/wx/zstream.h b/include/wx/zstream.h index f662277d18..51f8b86ef3 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -16,9 +16,10 @@ #if wxUSE_ZLIB && wxUSE_STREAMS #include "wx/stream.h" +#include "wx/versioninfo.h" // Compression level -enum { +enum wxZlibCompressionLevels { wxZ_DEFAULT_COMPRESSION = -1, wxZ_NO_COMPRESSION = 0, wxZ_BEST_SPEED = 1, @@ -26,7 +27,7 @@ enum { }; // Flags -enum { +enum wxZLibFlags { wxZLIB_NO_HEADER = 0, // raw deflate stream, no header or checksum wxZLIB_ZLIB = 1, // zlib header and checksum wxZLIB_GZIP = 2, // gzip header and checksum, requires zlib 1.2.1+ @@ -44,6 +45,9 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { static bool CanHandleGZip(); + bool SetDictionary(const char *data, const size_t datalen); + bool SetDictionary(const wxMemoryBuffer &buf); + protected: size_t OnSysRead(void *buffer, size_t size); wxFileOffset OnSysTell() const { return m_pos; } @@ -57,7 +61,7 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { struct z_stream_s *m_inflate; wxFileOffset m_pos; - DECLARE_NO_COPY_CLASS(wxZlibInputStream) + wxDECLARE_NO_COPY_CLASS(wxZlibInputStream); }; class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { @@ -72,6 +76,9 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { static bool CanHandleGZip(); + bool SetDictionary(const char *data, const size_t datalen); + bool SetDictionary(const wxMemoryBuffer &buf); + protected: size_t OnSysWrite(const void *buffer, size_t size); wxFileOffset OnSysTell() const { return m_pos; } @@ -87,7 +94,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { struct z_stream_s *m_deflate; wxFileOffset m_pos; - DECLARE_NO_COPY_CLASS(wxZlibOutputStream) + wxDECLARE_NO_COPY_CLASS(wxZlibOutputStream); }; class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory @@ -132,6 +139,8 @@ private: DECLARE_DYNAMIC_CLASS(wxGzipClassFactory) }; +WXDLLIMPEXP_BASE wxVersionInfo wxGetZlibVersionInfo(); + #endif // wxUSE_ZLIB && wxUSE_STREAMS