X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53663be8a5ea8e1c6f178839209b67e8228e4642..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index a2c2aa55da..0a02f17e8f 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -6,13 +6,9 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "datstrm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -23,6 +19,7 @@
 #if wxUSE_STREAMS
 
 #include "wx/datstrm.h"
+#include "wx/math.h"
 
 // ---------------------------------------------------------------------------
 // wxDataInputStream
@@ -30,18 +27,14 @@
 
 #if wxUSE_UNICODE
 wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)
-  : m_input(&s), m_be_order(FALSE), m_conv(conv)
+  : m_input(&s), m_be_order(false), m_conv(conv)
 #else
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
-  : m_input(&s), m_be_order(FALSE)
+  : m_input(&s), m_be_order(false)
 #endif
 {
 }
 
-wxDataInputStream::~wxDataInputStream()
-{
-}
-
 wxUint64 wxDataInputStream::Read64()
 {
   wxUint64 i64;
@@ -86,16 +79,13 @@ wxUint8 wxDataInputStream::Read8()
   return (wxUint8)buf;
 }
 
-// Must be at global scope for VC++ 5
-extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
-
 double wxDataInputStream::ReadDouble()
 {
 #if wxUSE_APPLE_IEEE
   char buf[10];
 
   m_input->Read(buf, 10);
-  return ConvertFromIeeeExtended((unsigned char *)buf);
+  return ConvertFromIeeeExtended((const wxInt8 *)buf);
 #else
   return 0.0;
 #endif
@@ -110,15 +100,13 @@ wxString wxDataInputStream::ReadString()
   if (len > 0)
   {
 #if wxUSE_UNICODE
-    char *tmp = new char[len + 1];
-    m_input->Read(tmp, len);
-    tmp[len] = 0;
-    wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) );
-    delete[] tmp;
+    wxCharBuffer tmp(len + 1);
+    m_input->Read(tmp.data(), len);
+    tmp.data()[len] = '\0';
+    wxString ret(m_conv.cMB2WX(tmp.data()));
 #else
     wxString ret;
-    m_input->Read( ret.GetWriteBuf(len), len);
-    ret.UngetWriteBuf();
+    m_input->Read( wxStringBuffer(ret, len), len);
 #endif
     return ret;
   }
@@ -150,24 +138,24 @@ void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
 
 void wxDataInputStream::Read32(wxUint32 *buffer, size_t size)
 {
-  m_input->Read(buffer, size * 4);
+    m_input->Read(buffer, size * 4);
 
-  if (m_be_order)
-  {
-    for (wxUint32 i=0; i<size; i++)
+    if (m_be_order)
     {
-      wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
-      *(buffer++) = v;
+        for (wxUint32 i=0; i<size; i++)
+        {
+            wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
+            *(buffer++) = v;
+        }
     }
-  }
-else
-  {
-    for (wxUint32 i=0; i<size; i++)
+    else
     {
-      wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
-      *(buffer++) = v;
+        for (wxUint32 i=0; i<size; i++)
+        {
+            wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
+            *(buffer++) = v;
+        }
     }
-  }
 }
 
 void wxDataInputStream::Read16(wxUint16 *buffer, size_t size)
@@ -271,18 +259,14 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f)
 
 #if wxUSE_UNICODE
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
-  : m_output(&s), m_be_order(FALSE), m_conv(conv)
+  : m_output(&s), m_be_order(false), m_conv(conv)
 #else
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
-  : m_output(&s), m_be_order(FALSE)
+  : m_output(&s), m_be_order(false)
 #endif
 {
 }
 
-wxDataOutputStream::~wxDataOutputStream()
-{
-}
-
 void wxDataOutputStream::Write64(wxUint64 i)
 {
   wxUint64 i64;
@@ -335,17 +319,14 @@ void wxDataOutputStream::WriteString(const wxString& string)
       m_output->Write(buf, len);
 }
 
-// Must be at global scope for VC++ 5
-extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
-
 void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
 #if wxUSE_APPLE_IEEE
-  ConvertToIeeeExtended(d, (unsigned char *)buf);
+  ConvertToIeeeExtended(d, (wxInt8 *)buf);
 #else
-#ifndef __VMS__
+#if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #endif
    buf[0] = '\0';