#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
#if wxUSE_ZLIB && wxUSE_STREAMS
#include "wx/zstream.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
-#include "zlib.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__)
+ #include "..\zlib\zlib.h"
+#else
+ #include "zlib.h"
+#endif
#define ZSTREAM_BUFFER_SIZE 1024
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;
{
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;
return;
}
+ // Fixed by "Stefan Csomor" <csomor@advancedconcepts.ch>
+ 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;