X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0915d0b2e210701353ef30743d0df9c195f76295..66f2aa61c3c7bc326f3287739eded70ca61f775d:/include/wx/zstream.h diff --git a/include/wx/zstream.h b/include/wx/zstream.h index 66be16c5df..51f8b86ef3 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: zstream.h +// Name: wx/zstream.h // Purpose: Memory stream classes // Author: Guilhem Lavaux // Modified by: Mike Wetherell @@ -11,18 +11,15 @@ #ifndef _WX_WXZSTREAM_H__ #define _WX_WXZSTREAM_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "zstream.h" -#endif - #include "wx/defs.h" #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, @@ -30,54 +27,120 @@ enum { }; // Flags -enum { - wxZLIB_NO_HEADER = 1 // required for use in Gzip and Zip files +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+ + wxZLIB_AUTO = 3 // autodetect header zlib or gzip }; class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { public: - wxZlibInputStream(wxInputStream& stream, int flags = 0); + wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO); + wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO); virtual ~wxZlibInputStream(); char Peek() { return wxInputStream::Peek(); } - size_t GetSize() const { return wxInputStream::GetSize(); } + wxFileOffset GetLength() const { return wxInputStream::GetLength(); } + + 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); - off_t OnSysTell() const { return m_pos; } + wxFileOffset OnSysTell() const { return m_pos; } + + private: + void Init(int flags); protected: size_t m_z_size; unsigned char *m_z_buffer; struct z_stream_s *m_inflate; - off_t m_pos; + wxFileOffset m_pos; - DECLARE_NO_COPY_CLASS(wxZlibInputStream) + wxDECLARE_NO_COPY_CLASS(wxZlibInputStream); }; class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream { public: - wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = 0); - virtual ~wxZlibOutputStream(); + wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB); + wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB); + virtual ~wxZlibOutputStream() { Close(); } void Sync() { DoFlush(false); } - size_t GetSize() const { return (size_t)m_pos; } + bool Close(); + wxFileOffset GetLength() const { return m_pos; } + + 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); - off_t OnSysTell() const { return m_pos; } + wxFileOffset OnSysTell() const { return m_pos; } virtual void DoFlush(bool final); + private: + void Init(int level, int flags); + protected: size_t m_z_size; unsigned char *m_z_buffer; struct z_stream_s *m_deflate; - off_t m_pos; + wxFileOffset m_pos; + + wxDECLARE_NO_COPY_CLASS(wxZlibOutputStream); +}; - DECLARE_NO_COPY_CLASS(wxZlibOutputStream) +class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory +{ +public: + wxZlibClassFactory(); + + wxFilterInputStream *NewStream(wxInputStream& stream) const + { return new wxZlibInputStream(stream); } + wxFilterOutputStream *NewStream(wxOutputStream& stream) const + { return new wxZlibOutputStream(stream, -1); } + wxFilterInputStream *NewStream(wxInputStream *stream) const + { return new wxZlibInputStream(stream); } + wxFilterOutputStream *NewStream(wxOutputStream *stream) const + { return new wxZlibOutputStream(stream, -1); } + + const wxChar * const *GetProtocols(wxStreamProtocolType type + = wxSTREAM_PROTOCOL) const; + +private: + DECLARE_DYNAMIC_CLASS(wxZlibClassFactory) }; +class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory +{ +public: + wxGzipClassFactory(); + + wxFilterInputStream *NewStream(wxInputStream& stream) const + { return new wxZlibInputStream(stream); } + wxFilterOutputStream *NewStream(wxOutputStream& stream) const + { return new wxZlibOutputStream(stream, -1); } + wxFilterInputStream *NewStream(wxInputStream *stream) const + { return new wxZlibInputStream(stream); } + wxFilterOutputStream *NewStream(wxOutputStream *stream) const + { return new wxZlibOutputStream(stream, -1); } + + const wxChar * const *GetProtocols(wxStreamProtocolType type + = wxSTREAM_PROTOCOL) const; + +private: + DECLARE_DYNAMIC_CLASS(wxGzipClassFactory) +}; + +WXDLLIMPEXP_BASE wxVersionInfo wxGetZlibVersionInfo(); + #endif // wxUSE_ZLIB && wxUSE_STREAMS