added conversion to mac native filenames from local filesystem handler

[wxWidgets.git] / src / common / zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 13a2fd352167ab712a7dca042216fdad4b829b4e..5142f077b660439ed35a150452ccc7ef0ddde860 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -34,7 +34,7 @@
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
    #include "../zlib/zlib.h"
 #elif defined(__WXMAC__) && defined(__UNIX__)
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
    #include "../zlib/zlib.h"
 #elif defined(__WXMAC__) && defined(__UNIX__)

-   #include <Zip/zlib.h>
+   #include <Kernel/net/zlib.h>

 #else
    #include <zlib.h>
 #endif
 #else
    #include <zlib.h>
 #endif


@@ -48,8 +48,6 @@
 wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   : wxFilterInputStream(stream)
 {
 wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   : wxFilterInputStream(stream)
 {

-  int err;
-

   // I need a private stream buffer.
   m_inflate = new z_stream_s;
 
   // I need a private stream buffer.
   m_inflate = new z_stream_s;
 


@@ -57,7 +55,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   m_inflate->zfree = (free_func)0;
   m_inflate->opaque = (voidpf)0;
 
   m_inflate->zfree = (free_func)0;
   m_inflate->opaque = (voidpf)0;
 

-  err = inflateInit(m_inflate);
+  int err = inflateInit(m_inflate);

   if (err != Z_OK) {
     inflateEnd(m_inflate);
     delete m_inflate;
   if (err != Z_OK) {
     inflateEnd(m_inflate);
     delete m_inflate;


@@ -75,6 +73,8 @@ wxZlibInputStream::~wxZlibInputStream()
 {
   inflateEnd(m_inflate);
   delete m_inflate;
 {
   inflateEnd(m_inflate);
   delete m_inflate;

+
+  delete [] m_z_buffer;

 }
 
 size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
 }
 
 size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)


@@ -159,6 +159,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   }
 
   deflateEnd(m_deflate);
   }
 
   deflateEnd(m_deflate);

+  delete m_deflate;

 
   delete[] m_z_buffer;
 }
 
   delete[] m_z_buffer;
 }