X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index f5ec6a5906..d6c473080b 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -1,20 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        zstream.h
+// Name:        wx/zstream.h
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #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
@@ -22,7 +18,7 @@
 #include "wx/stream.h"
 
 // Compression level
-enum {
+enum wxZlibCompressionLevels {
     wxZ_DEFAULT_COMPRESSION = -1,
     wxZ_NO_COMPRESSION = 0,
     wxZ_BEST_SPEED = 1,
@@ -30,10 +26,7 @@ enum {
 };
 
 // Flags
-enum {
-#if WXWIN_COMPATIBILITY_2_4
-    wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error
-#endif
+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+
@@ -43,25 +36,26 @@ enum {
 class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
  public:
   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();
 
  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;
-#if WXWIN_COMPATIBILITY_2_4
-  bool m_24compatibilty;
-#endif
+  wxFileOffset m_pos;
 
   DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
@@ -69,28 +63,75 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
-  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);
 
+ 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;
 
   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)
+};
+
 #endif
   // wxUSE_ZLIB && wxUSE_STREAMS