fix bug in Borland (bcc32 really hates ?)

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 29a7dfa23be4705492c86f675184b1fd8a0fdee7..f1380d5b644d42f05f1150e8287945390693fa09 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -33,10 +33,8 @@
 // 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"
 // 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"

-#elif defined(__WXMAC__) && defined(__UNIX__)
-   #include <Zip/zlib.h>

 #else
 #else

-   #include <zlib.h>
+   #include "zlib.h"

 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024
 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024


@@ -91,17 +89,17 @@ 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 &&
-          m_parent_i_stream->LastError() != wxStream_EOF)
+      wxStreamError err = m_parent_i_stream->GetLastError();
+      if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF)

       { 
       { 

-        m_lasterror = m_parent_i_stream->LastError();
+        m_lasterror = err;

         return 0; // failed to read anything
       }
 
       if ( m_inflate->avail_in == 0 )
       {
           // EOF
         return 0; // failed to read anything
       }
 
       if ( m_inflate->avail_in == 0 )
       {
           // EOF

-          m_lasterror = wxStream_EOF;
+          m_lasterror = wxSTREAM_EOF;

           break;
       }
     }
           break;
       }
     }


@@ -128,8 +126,14 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level)
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 
   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) {
 
   err = deflateInit(m_deflate, level);
   if (err != Z_OK) {


@@ -159,6 +163,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   }
 
   deflateEnd(m_deflate);
   }
 
   deflateEnd(m_deflate);

+  delete m_deflate;

 
   delete[] m_z_buffer;
 }
 
   delete[] m_z_buffer;
 }


@@ -205,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_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;
         return (size - m_deflate->avail_in);
 
       m_deflate->next_out = m_z_buffer;