X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96461cc29d03b4a7ab72abaae2e7edace93dd2a5..80a779275ae04443c568dca919adb26cf6f5002c:/src/common/mstream.cpp?ds=sidebyside diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index bab2afe326..f778677728 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -17,23 +17,23 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mstream.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_STREAMS -#include <stdlib.h> -#include "wx/stream.h" #include "wx/mstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif //WX_PRECOMP + +#include <stdlib.h> + // ============================================================================ // implementation // ============================================================================ @@ -54,12 +54,17 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len) wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream) { - int len = 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); @@ -87,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();