X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/mstream.cpp?ds=sidebyside diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 7532845c74..24252d273c 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: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -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 -#include "wx/stream.h" #include "wx/mstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif //WX_PRECOMP + +#include + // ============================================================================ // implementation // ============================================================================ @@ -42,16 +42,68 @@ // wxMemoryInputStream // ---------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream) + 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; } +void +wxMemoryInputStream::InitFromStream(wxInputStream& stream, wxFileOffset lenFile) +{ + if ( lenFile == wxInvalidOffset ) + 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( (wxFileOffset)len == lenFile, _T("huge files not supported") ); + + m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read); + m_i_streambuf->SetBufferIO(len); // create buffer + stream.Read(m_i_streambuf->GetBufferStart(), len); + m_i_streambuf->SetIntPosition(0); // seek to start pos + m_i_streambuf->Fixed(true); + m_length = stream.LastRead(); +} + +bool wxMemoryInputStream::CanRead() const +{ + return m_i_streambuf->GetIntPosition() != m_length; +} + wxMemoryInputStream::~wxMemoryInputStream() { delete m_i_streambuf; @@ -60,13 +112,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) @@ -85,12 +139,12 @@ size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) 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(); } @@ -99,13 +153,15 @@ off_t wxMemoryInputStream::OnSysTell() const // wxMemoryOutputStream // ---------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream) + 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 +182,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(); }