compilation fix for iconv call

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 21cc9ee95c56ced529ec7f56a096ac453934afa7..ab50d843865f1c8ee942ca2b6105678dc09d7bc3 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -52,6 +48,27 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
     m_length = len;
 }
 
     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;
+}
+

 wxMemoryInputStream::~wxMemoryInputStream()
 {
     delete m_i_streambuf;
 wxMemoryInputStream::~wxMemoryInputStream()
 {
     delete m_i_streambuf;


@@ -71,11 +88,6 @@ char wxMemoryInputStream::Peek()
     return buf[pos];
 }
 
     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();
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
 {
     size_t pos = m_i_streambuf->GetIntPosition();