X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67c8c225f469529d86afa1c4e817e96d97c22d18..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/mstream.cpp diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 9226ce4461..f778677728 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,23 +17,23 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#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 -#include "wx/stream.h" #include "wx/mstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif //WX_PRECOMP + +#include + // ============================================================================ // implementation // ============================================================================ @@ -47,8 +47,29 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len) m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); m_i_streambuf->SetBufferIO((void *)data, len); // const_cast m_i_streambuf->SetIntPosition(0); // seek to start pos - m_i_streambuf->Fixed(TRUE); + m_i_streambuf->Fixed(true); + + m_length = len; +} + +wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream) +{ + 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); + m_i_streambuf->SetIntPosition(0); // seek to start pos + m_i_streambuf->Fixed(true); m_length = len; } @@ -60,13 +81,15 @@ wxMemoryInputStream::~wxMemoryInputStream() char wxMemoryInputStream::Peek() { char *buf = (char *)m_i_streambuf->GetBufferStart(); + size_t pos = m_i_streambuf->GetIntPosition(); + if ( pos == m_length ) + { + m_lasterror = wxSTREAM_READ_ERROR; - return buf[m_i_streambuf->GetIntPosition()]; -} + return 0; + } -bool wxMemoryInputStream::Eof() const -{ - return !m_i_streambuf->GetBytesLeft(); + return buf[pos]; } size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) @@ -80,17 +103,17 @@ size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) } m_i_streambuf->Read(buffer, nbytes); - m_lasterror = wxSTREAM_NOERROR; + m_lasterror = wxSTREAM_NO_ERROR; return m_i_streambuf->GetIntPosition() - pos; } -off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { return m_i_streambuf->Seek(pos, mode); } -off_t wxMemoryInputStream::OnSysTell() const +wxFileOffset wxMemoryInputStream::OnSysTell() const { return m_i_streambuf->Tell(); } @@ -104,8 +127,8 @@ wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len) m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write); if ( data ) m_o_streambuf->SetBufferIO(data, len); - m_o_streambuf->Fixed(FALSE); - m_o_streambuf->Flushable(FALSE); + m_o_streambuf->Fixed(false); + m_o_streambuf->Flushable(false); } wxMemoryOutputStream::~wxMemoryOutputStream() @@ -126,12 +149,12 @@ size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes) return newpos - oldpos; } -off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { return m_o_streambuf->Seek(pos, mode); } -off_t wxMemoryOutputStream::OnSysTell() const +wxFileOffset wxMemoryOutputStream::OnSysTell() const { return m_o_streambuf->Tell(); }