Small bugfix

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 110199eda6d184c0cce196e1efdb162b770cd4b3..1090d6b3a297a148961138b65ca8b7eaf6219627 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -8,21 +8,33 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 #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 "wx/log.h"
-#include "../zlib/zlib.h"   // don't change this, Robert

 
 #ifdef __BORLANDC__
 
 #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
 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024


@@ -37,8 +49,6 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   int err;
 
   // I need a private stream buffer.
   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;
   m_inflate = new z_stream_s;
 
   m_inflate->zalloc = (alloc_func)0;


@@ -99,8 +109,6 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
 {
   int err;
 
 {
   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;
   m_deflate = new z_stream_s;
 
   m_deflate->zalloc = (alloc_func)0;


@@ -130,7 +138,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {

-    wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );

     return;
   }
 
     return;
   }
 


@@ -152,6 +160,19 @@ void wxZlibOutputStream::Sync()
     return;
   }
 
     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;
   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;


@@ -181,3 +202,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
   }
   return size;
 }
   }
   return size;
 }

+
+#endif
+  // wxUSE_ZLIB && wxUSE_STREAMS
+