X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84fff0b395adcfecd09dd65389ba7c1c47dd7eee..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/zstream.cpp diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 90d3338161..2636efd14b 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -8,6 +8,7 @@ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// + #ifdef __GNUG__ #pragma implementation "zstream.h" #endif @@ -15,17 +16,25 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/zstream.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif -#if wxUSE_ZLIB +#if wxUSE_ZLIB && wxUSE_STREAMS +#include "wx/zstream.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" -#include "../zlib/zlib.h" // don't change this, Robert -#ifdef __BORLANDC__ -#pragma hdrstop +// normally, the compiler options should contain -I../zlib, but it is +// apparently not the case for all MSW makefiles and so, unless we use +// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by +// 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" +#else + #include "zlib.h" #endif #define ZSTREAM_BUFFER_SIZE 1024 @@ -37,18 +46,14 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream) : wxFilterInputStream(stream) { - int err; - // I need a private stream buffer. - m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read); - m_i_destroybuf = TRUE; m_inflate = new z_stream_s; m_inflate->zalloc = (alloc_func)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; @@ -66,6 +71,8 @@ wxZlibInputStream::~wxZlibInputStream() { inflateEnd(m_inflate); delete m_inflate; + + delete [] m_z_buffer; } size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) @@ -78,39 +85,51 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) while (m_inflate->avail_out > 0) { if (m_inflate->avail_in == 0) { - m_parent_i_stream->Read(m_z_buffer, m_z_size); + m_parent_i_stream->Read(m_z_buffer, wxMin(m_z_size, 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) - return (size - m_inflate->avail_in); + if (m_parent_i_stream->LastError() != wxStream_NOERROR && + m_parent_i_stream->LastError() != wxStream_EOF) + { + m_lasterror = m_parent_i_stream->LastError(); + return 0; // failed to read anything + } + + if ( m_inflate->avail_in == 0 ) + { + // EOF + m_lasterror = wxStream_EOF; + break; + } } err = inflate(m_inflate, Z_FINISH); if (err == Z_STREAM_END) - return (size - m_inflate->avail_in); + return (size - m_inflate->avail_out); } - return size-m_inflate->avail_in; + return size-m_inflate->avail_out; } ////////////////////// // wxZlibOutputStream ////////////////////// -wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream) +wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level) : wxFilterOutputStream(stream) { int err; - m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write); - m_o_destroybuf = TRUE; m_deflate = new z_stream_s; m_deflate->zalloc = (alloc_func)0; m_deflate->zfree = (free_func)0; m_deflate->opaque = (voidpf)0; - err = deflateInit(m_deflate, Z_DEFAULT_COMPRESSION); + if (level == -1) level = Z_DEFAULT_COMPRESSION; + 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) { deflateEnd(m_deflate); return; @@ -133,11 +152,12 @@ wxZlibOutputStream::~wxZlibOutputStream() err = deflate(m_deflate, Z_FINISH); if (err != Z_STREAM_END) { - wxLogDebug( _T("wxZlibOutputStream: an error occured while closing the stream.\n") ); + wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") ); return; } deflateEnd(m_deflate); + delete m_deflate; delete[] m_z_buffer; } @@ -155,6 +175,19 @@ void wxZlibOutputStream::Sync() return; } + // Fixed by "Stefan Csomor" + while( m_deflate->avail_out == 0 ) + { + m_parent_o_stream->Write(m_z_buffer, m_z_size ); + m_deflate->next_out = m_z_buffer; + m_deflate->avail_out = m_z_size; + err = deflate(m_deflate, Z_FULL_FLUSH); + if (err != Z_OK) { + return; + } + } + // End + m_parent_o_stream->Write(m_z_buffer, m_z_size-m_deflate->avail_out); m_deflate->next_out = m_z_buffer; m_deflate->avail_out = m_z_size; @@ -186,6 +219,5 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) } #endif - - // wxUSE_ZLIB + // wxUSE_ZLIB && wxUSE_STREAMS