bump subrelease number

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 122d6e7baaff9dd2fff33227d7b3b80d837eaaa0..f7786777284e9b4c4e24f0a1a116347aba08e98d 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -17,23 +17,23 @@
 // 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_STREAMS
 
 #endif
 
 #if wxUSE_STREAMS
 

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

 #include "wx/mstream.h"
 
 #include "wx/mstream.h"
 

+#ifndef   WX_PRECOMP
+    #include  "wx/stream.h"
+#endif  //WX_PRECOMP
+
+#include <stdlib.h>
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -54,12 +54,17 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
 
 wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
 {
 
 wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
 {

-    ssize_t len = (ssize_t)stream.GetLength();
-    if (len == wxInvalidOffset) {
+    const wxFileOffset lenFile = stream.GetLength();
+    if ( lenFile == wxInvalidOffset )
+    {

         m_i_streambuf = NULL;
         m_lasterror = wxSTREAM_EOF;
         return;
     }
         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 = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer
     stream.CopyTo(m_i_streambuf->GetBufferStart(), len);


@@ -87,11 +92,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();