Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / common / mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index f7786777284e9b4c4e24f0a1a116347aba08e98d..66af403e2f8140fe46874da4ddd3dcf8902f4cd1 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -42,10 +42,12 @@
 // 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->SetBufferIO(const_cast<void *>(data), len);
     m_i_streambuf->SetIntPosition(0); // seek to start pos
     m_i_streambuf->Fixed(true);
 
@@ -63,7 +65,7 @@ wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);
-    wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") );
+    wxASSERT_MSG( len == lenFile + size_t(0), wxT("huge files not supported") );
 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer
@@ -73,6 +75,35 @@ wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
     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, wxT("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;
@@ -122,6 +153,8 @@ wxFileOffset wxMemoryInputStream::OnSysTell() const
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream)
+
 wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
 {
     m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
@@ -161,7 +194,7 @@ wxFileOffset wxMemoryOutputStream::OnSysTell() const
 
 size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const
 {
-    wxCHECK_MSG( buffer, 0, _T("must have buffer to CopyTo") );
+    wxCHECK_MSG( buffer, 0, wxT("must have buffer to CopyTo") );
 
     if ( len > GetSize() )
         len = GetSize();