X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f1f5f16f780bb41aa2ea24ccbf728f14c86cc475:/src/common/mstream.cpp diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index b81a7f44a0..f778677728 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -21,15 +21,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_STREAMS -#include -#include "wx/stream.h" #include "wx/mstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif //WX_PRECOMP + +#include + // ============================================================================ // implementation // ============================================================================ @@ -50,12 +54,17 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len) wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream) { - ssize_t len = (ssize_t)stream.GetLength(); - if (len == wxInvalidOffset) { + const wxFileOffset lenFile = stream.GetLength(); + if ( lenFile == wxInvalidOffset ) + { m_i_streambuf = NULL; m_lasterror = wxSTREAM_EOF; return; } + + const size_t len = wx_truncate_cast(size_t, lenFile); + wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") ); + m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); m_i_streambuf->SetBufferIO(len); // create buffer stream.CopyTo(m_i_streambuf->GetBufferStart(), len); @@ -83,11 +92,6 @@ char wxMemoryInputStream::Peek() return buf[pos]; } -bool wxMemoryInputStream::Eof() const -{ - return !m_i_streambuf->GetBytesLeft(); -} - size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) { size_t pos = m_i_streambuf->GetIntPosition();