X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cd9bfe8dacee998429236912c831fd2472163a8..c3317e87ec1795b8471e684f06e5366ec6f645a2:/src/common/mstream.cpp?ds=inline diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index d19b9755df..560c0fd1ae 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -23,103 +23,26 @@ #pragma hdrstop #endif -#if !USE_SHARED_LIBRARY -IMPLEMENT_CLASS(wxMemoryInputStream, wxInputStream) -IMPLEMENT_CLASS(wxMemoryOutputStream, wxOutputStream) -IMPLEMENT_CLASS2(wxMemoryStream, wxInputStream, wxOutputStream) -#endif - -// ---------------------------------------------------------------------------- -// wxMemoryStreamBase -// ---------------------------------------------------------------------------- -wxMemoryStreamBase::wxMemoryStreamBase() -{ - m_buffer = NULL; - m_iolimit = 0; - m_persistent = FALSE; - m_length = 0; -} - -wxMemoryStreamBase::~wxMemoryStreamBase() -{ - if (!m_persistent && m_buffer) - free(m_buffer); -} - -bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size) -{ - if (m_iolimit == 1) - return FALSE; - - m_length = new_size; - if (!m_buffer) - m_buffer = (char *)malloc(m_length); - else - m_buffer = (char *)realloc(m_buffer, m_length); - - return (m_buffer != NULL); -} - // ---------------------------------------------------------------------------- // wxMemoryInputStream // ---------------------------------------------------------------------------- wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len) + : wxInputStream() { - m_persistent = TRUE; + m_i_streambuf->SetBufferIO((char*) data, (char*) (data+len)); + m_i_streambuf->SetIntPosition(0); // seek to start pos + m_i_streambuf->Fixed(TRUE); m_length = len; - m_buffer = (char *)data; // It's bad. - m_position_i = 0; - m_lastread = 0; - m_eof = FALSE; - m_iolimit = 1; } wxMemoryInputStream::~wxMemoryInputStream() { } -wxInputStream& wxMemoryInputStream::Read(void *buffer, size_t size) -{ - if (m_iolimit == 2) { - m_eof = TRUE; - return *this; - } - if (m_position_i+size > m_length) - size = m_length-m_position_i; - - memcpy((void *)((unsigned long)buffer+m_position_i), m_buffer, size); - m_position_i += size; - m_lastread = size; - - return *this; -} - -off_t wxMemoryInputStream::SeekI(off_t pos, wxSeekMode mode) +char wxMemoryInputStream::Peek() { - if (m_iolimit == 2) - return 0; - - switch (mode) { - case wxFromStart: - if ((size_t)pos > m_length) - return m_position_i; - return (m_position_i = pos); - - case wxFromCurrent: - if ((size_t)(m_position_i+pos) > m_length) - return m_position_i; - - return (m_position_i += pos); - - case wxFromEnd: - if ((size_t)(m_length-pos) > m_length) - return m_position_i; - - return (m_position_i = m_length-pos); - } - - return m_position_i; + return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()]; } // ---------------------------------------------------------------------------- @@ -127,80 +50,13 @@ off_t wxMemoryInputStream::SeekI(off_t pos, wxSeekMode mode) // ---------------------------------------------------------------------------- wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len) + : wxOutputStream() { - m_persistent = FALSE; - m_buffer = data; - m_length = len; - m_position_o = 0; - m_lastwrite = 0; - m_bad = FALSE; - m_iolimit = 2; + if (data) + m_o_streambuf->SetBufferIO(data, data+len); + m_o_streambuf->Fixed(TRUE); } wxMemoryOutputStream::~wxMemoryOutputStream() { } - -wxOutputStream& wxMemoryOutputStream::Write(const void *buffer, size_t size) -{ - if (m_iolimit == 1) { - m_bad = TRUE; - return *this; - } - - if (m_position_o+size > m_length) - if (!ChangeBufferSize(m_position_o+size)) { - m_bad = TRUE; - return *this; - } - - memcpy(m_buffer+m_position_o, buffer, size); - m_position_o += size; - m_lastwrite = size; - - return *this; -} - -off_t wxMemoryOutputStream::SeekO(off_t pos, wxSeekMode mode) -{ - if (m_iolimit == 1) - return 0; - - switch (mode) { - case wxFromStart: - if ((size_t)pos > m_length) - return m_position_o; - return (m_position_o = pos); - - case wxFromCurrent: - if ((size_t)(m_position_o+pos) > m_length) - return m_position_o; - - return (m_position_o += pos); - - case wxFromEnd: - if ((size_t)(m_length-pos) > m_length) - return m_position_o; - - return (m_position_o = m_length-pos); - } - - return m_position_o; -} - -// ---------------------------------------------------------------------------- -// wxMemoryStream -// ---------------------------------------------------------------------------- - -wxMemoryStream::wxMemoryStream(char *data, size_t len) - : wxMemoryInputStream(NULL, 0), wxMemoryOutputStream(NULL, 0) -{ - m_persistent = FALSE; - m_buffer = data; - m_length = len; - m_iolimit = 0; -} - -wxMemoryStream::~wxMemoryStream() -{ -}