X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..a4a6984d5e2d8ae424cc8f31c223304b260d7670:/src/common/zstream.cpp?ds=sidebyside diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index e0285c9db1..5142f077b6 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -33,6 +33,8 @@ // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH) #include "../zlib/zlib.h" +#elif defined(__WXMAC__) && defined(__UNIX__) + #include #else #include #endif @@ -46,8 +48,6 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream) : wxFilterInputStream(stream) { - int err; - // I need a private stream buffer. m_inflate = new z_stream_s; @@ -55,7 +55,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream) 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; @@ -73,6 +73,8 @@ wxZlibInputStream::~wxZlibInputStream() { inflateEnd(m_inflate); delete m_inflate; + + delete [] m_z_buffer; } size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) @@ -157,6 +159,7 @@ wxZlibOutputStream::~wxZlibOutputStream() } deflateEnd(m_deflate); + delete m_deflate; delete[] m_z_buffer; }