added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index d75c423885488611d96b110427b79f05df7436ae..21cc9ee95c56ced529ec7f56a096ac453934afa7 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -1,200 +1,158 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mstream.cpp
+// Name:        src/common/mstream.cpp

 // Purpose:     "Memory stream" classes
 // Author:      Guilhem Lavaux
 // Purpose:     "Memory stream" classes
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: VZ (23.11.00): general code review

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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"
 #pragma implementation "mstream.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include <stdlib.h>
-#include <wx/stream.h>
-#include <wx/mstream.h>

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-// ----------------------------------------------------------------------------
-// wxMemoryStreamBase
-// ----------------------------------------------------------------------------
-wxMemoryStreamBase::wxMemoryStreamBase()
-{
-  m_buffer = NULL;
-  m_iolimit = 0;
-  m_persistent = FALSE;
-  m_length = 0;
-}
+#if wxUSE_STREAMS

 
 

-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);
+#include <stdlib.h>
+#include "wx/stream.h"
+#include "wx/mstream.h"

 
 

-  return (m_buffer != NULL);
-}
+// ============================================================================
+// implementation
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 // wxMemoryInputStream
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMemoryInputStream
 // ----------------------------------------------------------------------------
 

-wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
+wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)

 {
 {

-  m_persistent = TRUE;
-  m_length = len;
-  m_buffer = (char *)data; // It's bad.
-  m_position_i = 0;
-  m_lastread = 0;
-  m_eof = FALSE;
-  m_iolimit = 1;
+    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_length = len;

 }
 
 wxMemoryInputStream::~wxMemoryInputStream()
 {
 }
 
 wxMemoryInputStream::~wxMemoryInputStream()
 {

+    delete m_i_streambuf;

 }
 
 }
 

-wxInputStream& wxMemoryInputStream::Read(void *buffer, size_t size)
+char wxMemoryInputStream::Peek()

 {
 {

-  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;
+    char *buf = (char *)m_i_streambuf->GetBufferStart();
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+
+        return 0;
+    }
+
+    return buf[pos];

 }
 
 }
 

-off_t wxMemoryInputStream::SeekI(off_t pos, wxSeekMode mode)
+bool wxMemoryInputStream::Eof() const

 {
 {

-  if (m_iolimit == 2)
-    return 0;
+    return !m_i_streambuf->GetBytesLeft();
+}

 
 

-  switch (mode) {
-  case wxFromStart:
-    if ((size_t)pos > m_length)
-      return m_position_i;
-    return (m_position_i = pos);
+size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
+{
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_EOF;

 
 

-  case wxFromCurrent:
-    if ((size_t)(m_position_i+pos) > m_length)
-      return m_position_i;
+        return 0;
+    }

 
 

-    return (m_position_i += pos);
+    m_i_streambuf->Read(buffer, nbytes);
+    m_lasterror = wxSTREAM_NO_ERROR;

 
 

-  case wxFromEnd:
-    if ((size_t)(m_length-pos) > m_length)
-      return m_position_i;
+    return m_i_streambuf->GetIntPosition() - pos;
+}

 
 

-    return (m_position_i = m_length-pos);
-  }
+wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_i_streambuf->Seek(pos, mode);
+}

 
 

-  return m_position_i;
+wxFileOffset wxMemoryInputStream::OnSysTell() const
+{
+    return m_i_streambuf->Tell();

 }
 
 // ----------------------------------------------------------------------------
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
 

-wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
+wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)

 {
 {

-  m_persistent = FALSE;
-  m_buffer = data;
-  m_length = len;
-  m_position_o = 0;
-  m_lastwrite = 0;
-  m_bad = FALSE;
-  m_iolimit = 2;
+    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);

 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
 {
 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
 {

+    delete m_o_streambuf;

 }
 
 }
 

-wxOutputStream& wxMemoryOutputStream::Write(const void *buffer, size_t size)
+size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)

 {
 {

-  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;
-    }
+    size_t oldpos = m_o_streambuf->GetIntPosition();
+    m_o_streambuf->Write(buffer, nbytes);
+    size_t newpos = m_o_streambuf->GetIntPosition();

 
 

-  memcpy(m_buffer+m_position_o, buffer, size);
-  m_position_o += size;
-  m_lastwrite = size;
+    // FIXME can someone please explain what this does? (VZ)
+    if ( !newpos )
+        newpos = m_o_streambuf->GetBufferSize();

 
 

-  return *this;
+    return newpos - oldpos;

 }
 
 }
 

-off_t wxMemoryOutputStream::SeekO(off_t pos, wxSeekMode mode)
+wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset 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;
+    return m_o_streambuf->Seek(pos, mode);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxMemoryStream
-// ----------------------------------------------------------------------------
-
-wxMemoryStream::wxMemoryStream(char *data, size_t len)
-  : wxMemoryInputStream(NULL, 0), wxMemoryOutputStream(NULL, 0)
+wxFileOffset wxMemoryOutputStream::OnSysTell() const

 {
 {

-  m_persistent = FALSE;
-  m_buffer = data;
-  m_length = len;
-  m_iolimit = 0;
+    return m_o_streambuf->Tell();

 }
 
 }
 

-wxMemoryStream::~wxMemoryStream()
+size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const

 {
 {

+    wxCHECK_MSG( buffer, 0, _T("must have buffer to CopyTo") );
+
+    if ( len > GetSize() )
+        len = GetSize();
+
+    memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
+
+    return len;

 }
 }

+
+#endif // wxUSE_STREAMS