X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..718e35a651487b43ab21b15f0bbdf5318c3cad1f:/include/wx/zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 76734083d2..748abd7b47 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -2,58 +2,98 @@
 // Name:        zstream.h
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Mike Wetherell
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXZSTREAM_H__
-#define __WXZSTREAM_H__
+#ifndef _WX_WXZSTREAM_H__
+#define _WX_WXZSTREAM_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "zstream.h"
 #endif
 
-#include <wx/stream.h>
-#include "zlib.h"
+#include "wx/defs.h"
 
-class wxZlibInputStream: public wxFilterInputStream {
+#if wxUSE_ZLIB && wxUSE_STREAMS
+
+#include "wx/stream.h"
+
+// Compression level
+enum {
+    wxZ_DEFAULT_COMPRESSION = -1,
+    wxZ_NO_COMPRESSION = 0,
+    wxZ_BEST_SPEED = 1,
+    wxZ_BEST_COMPRESSION = 9
+};
+
+// Flags
+enum {
+#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);
+  wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);
   virtual ~wxZlibInputStream();
 
-  bool Eof() const;
+  char Peek() { return wxInputStream::Peek(); }
+  size_t GetSize() const { return wxInputStream::GetSize(); }
+
+  static bool CanHandleGZip();
 
  protected:
-  size_t DoRead(void *buffer, size_t size);
-  off_t DoSeekInput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
-  off_t DoTellInput() const { return wxInvalidOffset; }
+  size_t OnSysRead(void *buffer, size_t size);
+  off_t OnSysTell() const { return m_pos; }
 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
-  struct z_stream_s m_inflate;
+  struct z_stream_s *m_inflate;
+  off_t m_pos;
+#if WXWIN_COMPATIBILITY_2_4
+  bool m_24compatibilty;
+#endif
+
+  DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
 
-class wxZlibOutputStream: public wxFilterOutputStream {
+class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
-  wxZlibOutputStream(wxOutputStream& stream);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
   virtual ~wxZlibOutputStream();
 
-  void Sync();
+  void Sync() { DoFlush(false); }
+  size_t GetSize() const { return (size_t)m_pos; }
 
-  bool Bad() const;
+  static bool CanHandleGZip();
 
  protected:
-  size_t DoWrite(const void *buffer, size_t size);
-  off_t DoSeekOutput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
-  off_t DoTellOutput() const { return wxInvalidOffset; }
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysTell() const { return m_pos; }
+
+  virtual void DoFlush(bool final);
 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
-  struct z_stream_s m_deflate;
+  struct z_stream_s *m_deflate;
+  off_t m_pos;
+
+  DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
 };
 
 #endif
+  // wxUSE_ZLIB && wxUSE_STREAMS
+
+#endif
+   // _WX_WXZSTREAM_H__
+