X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/778d618acb1083ba8d98bbc46e7d5c76e824d924..6185050104d7782a51b9e9a7cac427764dcea130:/src/common/zstream.cpp?ds=sidebyside diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 5142f077b6..f1380d5b64 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -33,10 +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 + #include "zlib.h" #endif #define ZSTREAM_BUFFER_SIZE 1024 @@ -91,17 +89,17 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) m_inflate->next_in = m_z_buffer; m_inflate->avail_in = m_parent_i_stream->LastRead(); - if (m_parent_i_stream->LastError() != wxStream_NOERROR && - m_parent_i_stream->LastError() != wxStream_EOF) + wxStreamError err = m_parent_i_stream->GetLastError(); + if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { - m_lasterror = m_parent_i_stream->LastError(); + m_lasterror = err; return 0; // failed to read anything } if ( m_inflate->avail_in == 0 ) { // EOF - m_lasterror = wxStream_EOF; + m_lasterror = wxSTREAM_EOF; break; } } @@ -128,8 +126,14 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level) m_deflate->zfree = (free_func)0; m_deflate->opaque = (voidpf)0; - if (level == -1) level = Z_DEFAULT_COMPRESSION; - wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!")); + if ( level == -1 ) + { + level = Z_DEFAULT_COMPRESSION; + } + else + { + wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!")); + } err = deflateInit(m_deflate, level); if (err != Z_OK) { @@ -206,7 +210,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) if (m_deflate->avail_out == 0) { m_parent_o_stream->Write(m_z_buffer, m_z_size); - if (m_parent_o_stream->LastError() != wxStream_NOERROR) + if ( !*m_parent_o_stream ) return (size - m_deflate->avail_in); m_deflate->next_out = m_z_buffer;