-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
// Name: zstream.cpp
// Purpose: Compressed stream classes
// Author: Guilhem Lavaux
-// Modified by:
+// Modified by: Mike Wetherell
// Created: 11/07/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "zstream.h"
#endif
#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__)
- #include "..\zlib\zlib.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"
#else
#include "zlib.h"
#endif
-#define ZSTREAM_BUFFER_SIZE 1024
+enum {
+#ifdef __WIN16__
+ ZSTREAM_BUFFER_SIZE = 4096
+#else
+ ZSTREAM_BUFFER_SIZE = 16384
+#endif
+};
//////////////////////
// wxZlibInputStream
//////////////////////
-wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
+wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
: wxFilterInputStream(stream)
{
- int err;
-
- // I need a private stream buffer.
- 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);
- if (err != Z_OK) {
- inflateEnd(m_inflate);
- delete m_inflate;
- return;
- }
-
+ m_inflate = NULL;
m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
m_z_size = ZSTREAM_BUFFER_SIZE;
+ m_pos = 0;
+
+ if (m_z_buffer) {
+ m_inflate = new z_stream_s;
+
+ if (m_inflate) {
+ m_inflate->zalloc = (alloc_func)0;
+ m_inflate->zfree = (free_func)0;
+ m_inflate->opaque = (voidpf)0;
+ m_inflate->avail_in = 0;
+ m_inflate->next_in = NULL;
+ m_inflate->next_out = NULL;
+
+ wxASSERT((flags & ~(wxZLIB_ZLIB | wxZLIB_GZIP)) == 0);
+
+ // when autodetecting between gzip & zlib, silently drop gzip flag
+ // if the version of zlib doesn't support it
+ if (flags == (wxZLIB_ZLIB | wxZLIB_GZIP)
+ && strcmp(zlib_version, "1.2.") < 0)
+ flags &= ~wxZLIB_GZIP;
+
+ int bits = flags ? MAX_WBITS : -MAX_WBITS;
+ if (flags & wxZLIB_GZIP)
+ bits |= (flags & wxZLIB_ZLIB) ? 0x20 : 0x10;
+
+ if (inflateInit2(m_inflate, bits) == Z_OK)
+ return;
+ }
+ }
- m_inflate->avail_in = 0;
- m_inflate->next_in = NULL;
+ wxLogError(_("Can't initialize zlib inflate stream."));
+ m_lasterror = wxSTREAM_READ_ERROR;
}
wxZlibInputStream::~wxZlibInputStream()
{
inflateEnd(m_inflate);
delete m_inflate;
+
+ delete [] m_z_buffer;
}
size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
{
- int err;
+ wxASSERT_MSG(m_inflate && m_z_buffer, wxT("Inflate stream not open"));
+ if (!m_inflate || !m_z_buffer)
+ m_lasterror = wxSTREAM_READ_ERROR;
+ if (!IsOk() || !size)
+ return 0;
+
+ int err = Z_OK;
m_inflate->next_out = (unsigned char *)buffer;
m_inflate->avail_out = size;
- while (m_inflate->avail_out > 0) {
+ while (err == Z_OK && m_inflate->avail_out > 0) {
if (m_inflate->avail_in == 0) {
-
m_parent_i_stream->Read(m_z_buffer, m_z_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_inflate->avail_in == 0) {
+ if (m_parent_i_stream->Eof())
+ wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
+ m_lasterror = wxSTREAM_READ_ERROR;
+ break;
+ }
}
- err = inflate(m_inflate, Z_FINISH);
- if (err == Z_STREAM_END)
- return (size - m_inflate->avail_in);
+ err = inflate(m_inflate, Z_NO_FLUSH);
}
- return size-m_inflate->avail_in;
+ if (err == Z_STREAM_END) {
+ // Unread any data taken from past the end of the deflate stream, so that
+ // any additional data can be read from the underlying stream (the crc
+ // in a gzip for example)
+ if (m_inflate->avail_in) {
+ m_parent_i_stream->Ungetch(m_inflate->next_in, m_inflate->avail_in);
+ m_inflate->avail_in = 0;
+ }
+ m_lasterror = wxSTREAM_EOF;
+ } else if (err != Z_OK) {
+ wxString msg(m_inflate->msg, *wxConvCurrent);
+ if (!msg)
+ msg.Format(_("zlib error %d"), err);
+ wxLogError(_("Can't read from inflate stream: %s\n"), msg.c_str());
+ m_lasterror = wxSTREAM_READ_ERROR;
+ }
+
+ size -= m_inflate->avail_out;
+ m_pos += size;
+ return size;
}
//////////////////////
// wxZlibOutputStream
//////////////////////
-wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
+ int level,
+ int flags)
: wxFilterOutputStream(stream)
{
- int err;
-
- m_deflate = new z_stream_s;
-
- m_deflate->zalloc = (alloc_func)0;
- m_deflate->zfree = (free_func)0;
- m_deflate->opaque = (voidpf)0;
+ m_deflate = NULL;
+ m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
+ m_z_size = ZSTREAM_BUFFER_SIZE;
+ m_pos = 0;
- err = deflateInit(m_deflate, Z_DEFAULT_COMPRESSION);
- if (err != Z_OK) {
- deflateEnd(m_deflate);
- return;
+ if ( level == -1 )
+ {
+ level = Z_DEFAULT_COMPRESSION;
+ }
+ else
+ {
+ wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
}
- m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
- m_z_size = ZSTREAM_BUFFER_SIZE;
+ if (m_z_buffer) {
+ m_deflate = new z_stream_s;
+
+ if (m_deflate) {
+ m_deflate->zalloc = (alloc_func)0;
+ m_deflate->zfree = (free_func)0;
+ m_deflate->opaque = (voidpf)0;
+ m_deflate->avail_in = 0;
+ m_deflate->next_out = m_z_buffer;
+ m_deflate->avail_out = m_z_size;
+
+ wxASSERT(flags == 0 || flags == wxZLIB_ZLIB || flags == wxZLIB_GZIP);
+
+ int bits = flags ? MAX_WBITS : -MAX_WBITS;
+ if (flags & wxZLIB_GZIP)
+ bits |= 0x10;
+
+ if (deflateInit2(m_deflate, level, Z_DEFLATED, bits,
+ 8, Z_DEFAULT_STRATEGY) == Z_OK)
+ return;
+ }
+ }
- m_deflate->avail_in = 0;
- m_deflate->next_out = m_z_buffer;
- m_deflate->avail_out = m_z_size;
+ wxLogError(_("Can't initialize zlib deflate stream."));
+ m_lasterror = wxSTREAM_WRITE_ERROR;
}
wxZlibOutputStream::~wxZlibOutputStream()
{
- int err;
-
- Sync();
-
- err = deflate(m_deflate, Z_FINISH);
- if (err != Z_STREAM_END)
- {
- wxLogDebug( T("wxZlibOutputStream: an error occured while closing the stream.\n") );
- return;
- }
-
+ if (m_deflate && m_z_buffer)
+ DoFlush(true);
deflateEnd(m_deflate);
+ delete m_deflate;
delete[] m_z_buffer;
}
-void wxZlibOutputStream::Sync()
+void wxZlibOutputStream::DoFlush(bool final)
{
- int err;
+ wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open"));
- 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;
-
- err = deflate(m_deflate, Z_FULL_FLUSH);
- if (err != Z_OK) {
+ if (!m_deflate || !m_z_buffer)
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ if (!IsOk())
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
+ int err = Z_OK;
+ bool done = false;
+
+ while (err == Z_OK || err == Z_STREAM_END) {
+ size_t len = m_z_size - m_deflate->avail_out;
+ if (len) {
+ if (m_parent_o_stream->Write(m_z_buffer, len).LastWrite() != len) {
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
+ break;
+ }
+ m_deflate->next_out = m_z_buffer;
+ m_deflate->avail_out = m_z_size;
+ }
- 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;
+ if (done)
+ break;
+ err = deflate(m_deflate, final ? Z_FINISH : Z_FULL_FLUSH);
+ done = m_deflate->avail_out != 0 || err == Z_STREAM_END;
+ }
}
size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
{
- int err;
+ wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open"));
+
+ if (!m_deflate || !m_z_buffer)
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ if (!IsOk() || !size)
+ return 0;
+ int err = Z_OK;
m_deflate->next_in = (unsigned char *)buffer;
m_deflate->avail_in = size;
- while (m_deflate->avail_in > 0) {
-
+ while (err == Z_OK && m_deflate->avail_in > 0) {
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)
- return (size - m_deflate->avail_in);
+ if (m_parent_o_stream->LastWrite() != m_z_size) {
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
+ break;
+ }
m_deflate->next_out = m_z_buffer;
m_deflate->avail_out = m_z_size;
}
err = deflate(m_deflate, Z_NO_FLUSH);
- if (err != Z_OK)
- return (size - m_deflate->avail_in);
}
+
+ if (err != Z_OK) {
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ wxString msg(m_deflate->msg, *wxConvCurrent);
+ if (!msg)
+ msg.Format(_("zlib error %d"), err);
+ wxLogError(_("Can't write to deflate stream: %s\n"), msg.c_str());
+ }
+
+ size -= m_deflate->avail_in;
+ m_pos += size;
return size;
}
projects / wxWidgets.git / blobdiff