#include "wx/intl.h"
#include "wx/log.h"
-// When using configure, the path must be "zlib.h" I don't know
-// what other ports (wxMac, wxMotif without configure) need here.
-// If we are building with configure (defines __WX_SETUP_H__),
-// we trust the zlib path is given as a -I option.
-#if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
+// 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"
+#elif defined(__WXMAC__) && defined(__UNIX__)
+ #include <Kernel/net/zlib.h>
#else
#include "zlib.h"
#endif
wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
: wxFilterInputStream(stream)
{
- int err;
-
// I need a private stream buffer.
m_inflate = new z_stream_s;
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;
{
inflateEnd(m_inflate);
delete m_inflate;
+
+ delete [] m_z_buffer;
}
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_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;
}
deflateEnd(m_deflate);
+ delete m_deflate;
delete[] m_z_buffer;
}