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 1424f3b22bf2b18b638ebecb9c1fc092f04ab05f..7ca4e3bac4bdb934b807f177fb14dbea0f959a93 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -20,17 +20,22 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-

 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/zstream.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/zstream.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"

-#include "zlib.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
 
 
 #define ZSTREAM_BUFFER_SIZE 1024
 


@@ -84,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;


@@ -110,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;


@@ -133,7 +145,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( _T("wxZlibOutputStream: an error occured while closing the stream.\n") );
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );

     return;
   }
 
     return;
   }
 


@@ -155,6 +167,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;