Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements to zlib streams (patch 929416):

Browse Source 
1. CanHandleGZip static method
2. code cleanup
3. 2.4 compatibility mode


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-04-11 19:34:56 +00:00
parent 3e0a7f68f9
commit 4c68a10264
4 changed files with 172 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/zstream.h
View File

@@ -31,19 +31,25 @@ enum {
// Flags
enum {
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+
#if WXWIN_COMPATIBILITY_2_4
wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error
#endif
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 = wxZLIB_ZLIB | wxZLIB_GZIP);
wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);
virtual ~wxZlibInputStream();
char Peek() { return wxInputStream::Peek(); }
size_t GetSize() const { return wxInputStream::GetSize(); }
static bool CanHandleGZip();
protected:
size_t OnSysRead(void *buffer, size_t size);
off_t OnSysTell() const { return m_pos; }
@@ -53,8 +59,11 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
unsigned char *m_z_buffer;
struct z_stream_s *m_inflate;
off_t m_pos;
#if WXWIN_COMPATIBILITY_2_4
bool m_24compatibilty;
#endif
DECLARE_NO_COPY_CLASS(wxZlibInputStream)
DECLARE_NO_COPY_CLASS(wxZlibInputStream)
};
class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
@@ -65,6 +74,8 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
void Sync() { DoFlush(false); }
size_t GetSize() const { return (size_t)m_pos; }
static bool CanHandleGZip();
protected:
size_t OnSysWrite(const void *buffer, size_t size);
off_t OnSysTell() const { return m_pos; }
@@ -77,7 +88,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
struct z_stream_s *m_deflate;
off_t m_pos;
DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
};
#endif