Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/zstream.cpp
View File

@@ -89,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();
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
m_lasterror = wxStream_EOF;
m_lasterror = wxSTREAM_EOF;
break;
}
}
@@ -210,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_parent_o_stream->LastError() != wxStream_NOERROR)
if ( !*m_parent_o_stream )
return (size - m_deflate->avail_in);
m_deflate->next_out = m_z_buffer;