moved wxDash typedef to gdicmn.h

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index a50768c912f5d5204e063514ec7d872fa2ead483..7ca4e3bac4bdb934b807f177fb14dbea0f959a93 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -89,22 +89,26 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
       m_inflate->next_in = m_z_buffer;
       m_inflate->avail_in = m_parent_i_stream->LastRead();
 
       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
+      }

     }
     err = inflate(m_inflate, Z_FINISH);
     if (err == Z_STREAM_END)
     }
     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::wxZlibOutputStream(wxOutputStream& stream)
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level)

  : wxFilterOutputStream(stream)
 {
   int err;
  : wxFilterOutputStream(stream)
 {
   int err;


@@ -115,7 +119,10 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 
   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;
   if (err != Z_OK) {
     deflateEnd(m_deflate);
     return;