#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
// Flags
enum {
- wxZLIB_NO_HEADER = 1 // required for use in Gzip and Zip files
+#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 = 0);
+ 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();
protected:
size_t OnSysRead(void *buffer, size_t size);
- off_t OnSysTell() const { return m_pos; }
+ wxFileOffset OnSysTell() const { return m_pos; }
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s *m_inflate;
- off_t m_pos;
+ wxFileOffset 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 {
public:
- wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = 0);
- virtual ~wxZlibOutputStream();
+ 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();
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);
size_t m_z_size;
unsigned char *m_z_buffer;
struct z_stream_s *m_deflate;
- off_t m_pos;
+ wxFileOffset m_pos;
- DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
+ DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
};
#endif