typo fixed

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index fd1dc1062f655601376f3b85db6191d29dc34d8f..a50768c912f5d5204e063514ec7d872fa2ead483 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -8,20 +8,33 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
+
 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <wx/stream.h>
-#include <wx/zstream.h>
-#include <wx/utils.h>
-#include <wx/intl.h>
-#include "../zlib/zlib.h"   // don't change this, Robert
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
+#endif
+
+#if wxUSE_ZLIB && wxUSE_STREAMS
+
+#include "wx/zstream.h"
+#include "wx/utils.h"
+#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"
+#else
+   #include "zlib.h"
 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024
@@ -36,8 +49,6 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   int err;
 
   // I need a private stream buffer.
-  m_i_streambuf = new wxStreamBuffer(*this);
-  m_i_destroybuf = TRUE;
   m_inflate = new z_stream_s;
 
   m_inflate->zalloc = (alloc_func)0;
@@ -64,7 +75,7 @@ wxZlibInputStream::~wxZlibInputStream()
   delete m_inflate;
 }
 
-size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
+size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
 {
   int err;
 
@@ -78,7 +89,7 @@ size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
       m_inflate->next_in = m_z_buffer;
       m_inflate->avail_in = m_parent_i_stream->LastRead();
 
-      if (m_parent_i_stream->Eof())
+      if (m_parent_i_stream->LastError() != wxStream_NOERROR)
         return (size - m_inflate->avail_in);
     }
     err = inflate(m_inflate, Z_FINISH);
@@ -89,13 +100,6 @@ size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
   return size-m_inflate->avail_in;
 }
 
-bool wxZlibInputStream::Eof() const
-{
-  if (!m_eof)
-    return m_parent_i_stream->Eof();
-  return m_eof;
-}
-
 //////////////////////
 // wxZlibOutputStream
 //////////////////////
@@ -105,8 +109,6 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
 {
   int err;
 
-  m_o_streambuf = new wxStreamBuffer(*this);
-  m_o_destroybuf = TRUE;
   m_deflate = new z_stream_s;
 
   m_deflate->zalloc = (alloc_func)0;
@@ -134,9 +136,9 @@ wxZlibOutputStream::~wxZlibOutputStream()
   Sync();
 
   err = deflate(m_deflate, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    wxDebugMsg(_("wxZlibOutputStream: an error occured while we was closing "
-               "the stream.\n"));
+  if (err != Z_STREAM_END) 
+  {
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );
     return;
   }
 
@@ -155,16 +157,28 @@ void wxZlibOutputStream::Sync()
 
   err = deflate(m_deflate, Z_FULL_FLUSH);
   if (err != Z_OK) {
-    m_bad = TRUE;
     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;
 }
 
-size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
+size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
   int err;
 
@@ -175,7 +189,7 @@ size_t wxZlibOutputStream::DoWrite(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->Bad())
+      if (m_parent_o_stream->LastError() != wxStream_NOERROR)
         return (size - m_deflate->avail_in);
 
       m_deflate->next_out = m_z_buffer;
@@ -189,9 +203,6 @@ size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
   return size;
 }
 
-bool wxZlibOutputStream::Bad() const
-{
-  if (!m_bad)
-    return m_parent_o_stream->Bad();
-  return m_bad;
-}
+#endif
+  // wxUSE_ZLIB && wxUSE_STREAMS
+