unicode compilation fix

[wxWidgets.git] / src / common / zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 24f763bf289b6de153680790016a4dcb21c82d84..c58f98f71649847163aedfcaf5a7247e84845f3a 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "zstream.h"
 #endif
 
@@ -27,11 +27,11 @@
 #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"
 #else
    #include "zlib.h"
@@ -46,8 +46,6 @@
 wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   : wxFilterInputStream(stream)
 {
-  int err;
-
   // I need a private stream buffer.
   m_inflate = new z_stream_s;
 
@@ -55,7 +53,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   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;
@@ -73,6 +71,8 @@ wxZlibInputStream::~wxZlibInputStream()
 {
   inflateEnd(m_inflate);
   delete m_inflate;
+
+  delete [] m_z_buffer;
 }
 
 size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
@@ -85,19 +85,30 @@ 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);
+      wxStreamError err = m_parent_i_stream->GetLastError();
+      if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF)
+      { 
+        m_lasterror = err;
+        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;
 }
 
 //////////////////////
@@ -115,8 +126,14 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level)
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 
-  if (level == -1) level = Z_DEFAULT_COMPRESSION;
-  wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
+  if ( level == -1 )
+  {
+      level = Z_DEFAULT_COMPRESSION;
+  }
+  else
+  {
+    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) {
@@ -146,6 +163,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   }
 
   deflateEnd(m_deflate);
+  delete m_deflate;
 
   delete[] m_z_buffer;
 }
@@ -192,7 +210,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
 
     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)
+      if ( !*m_parent_o_stream )
         return (size - m_deflate->avail_in);
 
       m_deflate->next_out = m_z_buffer;