X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/src/common/zstream.cpp?ds=sidebyside diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 8283811fbb..739a58e836 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -19,6 +19,7 @@ #if wxUSE_ZLIB && wxUSE_STREAMS #include "wx/zstream.h" +#include "wx/versioninfo.h" #ifndef WX_PRECOMP #include "wx/intl.h" @@ -44,6 +45,14 @@ enum { }; +wxVersionInfo wxGetZlibVersionInfo() +{ + return wxVersionInfo("zlib", + ZLIB_VERNUM >> 12, + (ZLIB_VERNUM >> 8) & 0x0F, + (ZLIB_VERNUM & 0xFF) / 0x10); +} + ///////////////////////////////////////////////////////////////////////////// // Zlib Class factory @@ -335,11 +344,8 @@ bool wxZlibOutputStream::Close() { DoFlush(true); deflateEnd(m_deflate); - delete m_deflate; - - m_deflate = NULL; - delete[] m_z_buffer; - m_z_buffer = NULL; + wxDELETE(m_deflate); + wxDELETEA(m_z_buffer); return wxFilterOutputStream::Close() && IsOk(); }