#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__
int err;
// I need a private stream buffer.
- m_i_streambuf = new wxStreamBuffer(*this);
+ m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
m_i_destroybuf = TRUE;
m_inflate = new z_stream_s;
delete m_inflate;
}
-size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
+size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
{
int err;
m_inflate->next_in = m_z_buffer;
m_inflate->avail_in = m_parent_i_stream->LastRead();
- if (m_parent_i_stream->Eof())
+ if (m_parent_i_stream->LastError() != wxStream_NOERROR)
return (size - m_inflate->avail_in);
}
err = inflate(m_inflate, Z_FINISH);
return size-m_inflate->avail_in;
}
-bool wxZlibInputStream::Eof() const
-{
- if (!m_eof)
- return m_parent_i_stream->Eof();
- return m_eof;
-}
-
//////////////////////
// wxZlibOutputStream
//////////////////////
{
int err;
- m_o_streambuf = new wxStreamBuffer(*this);
+ m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
m_o_destroybuf = TRUE;
m_deflate = new z_stream_s;
Sync();
err = deflate(m_deflate, Z_FINISH);
- if (err != Z_STREAM_END) {
- wxDebugMsg(_("wxZlibOutputStream: an error occured while we was closing "
- "the stream.\n"));
+ if (err != Z_STREAM_END)
+ {
+ wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );
return;
}
err = deflate(m_deflate, Z_FULL_FLUSH);
if (err != Z_OK) {
- m_bad = TRUE;
return;
}
m_deflate->avail_out = m_z_size;
}
-size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
+size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
{
int err;
if (m_deflate->avail_out == 0) {
m_parent_o_stream->Write(m_z_buffer, m_z_size);
- if (m_parent_o_stream->Bad())
+ if (m_parent_o_stream->LastError() != wxStream_NOERROR)
return (size - m_deflate->avail_in);
m_deflate->next_out = m_z_buffer;
}
return size;
}
-
-bool wxZlibOutputStream::Bad() const
-{
- if (!m_bad)
- return m_parent_o_stream->Bad();
- return m_bad;
-}