Metrowerks Objective-C++ is more strict about types than Apple's.

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 3f456cca7cbb9690485e6cbb05e8f56a35347bd7..b661775598c3c8297cd56b1e5f793730c247c473 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -2,14 +2,14 @@
 // Name:        datstrm.cpp
 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux
 // Name:        datstrm.cpp
 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: Mickael Gilabert

 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Created:     28/06/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
-// Licence:    wxWindows license
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "datstrm.h"
 #endif
 
 #pragma implementation "datstrm.h"
 #endif
 


@@ -17,66 +17,69 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_STREAMS

 
 #include "wx/datstrm.h"
 
 
 #include "wx/datstrm.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
-IMPLEMENT_CLASS(wxDataOutputStream, wxFilterOutputStream)
-#endif
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------

 
 

+#if wxUSE_UNICODE
+wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)
+  : m_input(&s), m_be_order(false), m_conv(conv)
+#else

 wxDataInputStream::wxDataInputStream(wxInputStream& s)
 wxDataInputStream::wxDataInputStream(wxInputStream& s)

-  : wxFilterInputStream(s)
+  : m_input(&s), m_be_order(false)
+#endif

 {
 }
 
 {
 }
 

-wxDataInputStream::~wxDataInputStream()
+wxUint64 wxDataInputStream::Read64()

 {
 {

+  wxUint64 i64;
+
+  m_input->Read(&i64, 8);
+
+  if (m_be_order)
+    return wxUINT64_SWAP_ON_LE(i64);
+  else
+    return wxUINT64_SWAP_ON_BE(i64);

 }
 
 }
 

-unsigned long wxDataInputStream::Read32()
+wxUint32 wxDataInputStream::Read32()

 {
 {

-  char buf[4];
-
-  if (!m_parent_i_stream)
-    return 0;
+  wxUint32 i32;

 
 

-  Read(buf, 4);
+  m_input->Read(&i32, 4);

 
 

-  return (unsigned long)buf[0] |
-         ((unsigned long)buf[1] << 8) |
-         ((unsigned long)buf[2] << 16) |
-         ((unsigned long)buf[3] << 24);
+  if (m_be_order)
+    return wxUINT32_SWAP_ON_LE(i32);
+  else
+    return wxUINT32_SWAP_ON_BE(i32);

 }
 
 }
 

-unsigned short wxDataInputStream::Read16()
+wxUint16 wxDataInputStream::Read16()

 {
 {

-  char buf[2];
+  wxUint16 i16;

 
 

-  if (!m_parent_i_stream)
-    return 0;
+  m_input->Read(&i16, 2);

 
 

-  Read(buf, 2);
-
-  return (unsigned short)buf[0] |
-         ((unsigned short)buf[1] << 8);
+  if (m_be_order)
+    return wxUINT16_SWAP_ON_LE(i16);
+  else
+    return wxUINT16_SWAP_ON_BE(i16);

 }
 
 }
 

-unsigned char wxDataInputStream::Read8()
+wxUint8 wxDataInputStream::Read8()

 {
 {

-  char buf;
-
-  if (!m_parent_i_stream)
-    return 0;
+  wxUint8 buf;

 
 

-  Read(&buf, 1);
-  return (unsigned char)buf;
+  m_input->Read(&buf, 1);
+  return (wxUint8)buf;

 }
 
 // Must be at global scope for VC++ 5
 }
 
 // Must be at global scope for VC++ 5


@@ -84,115 +87,242 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 double wxDataInputStream::ReadDouble()
 {
 
 double wxDataInputStream::ReadDouble()
 {

-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   char buf[10];
 
   char buf[10];
 

-  if (!m_parent_i_stream)
-    return 0.0;
-
-  Read(buf, 10);
+  m_input->Read(buf, 10);

   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else
   return 0.0;
 #endif
 }
 
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else
   return 0.0;
 #endif
 }
 

-wxString wxDataInputStream::ReadLine()
+wxString wxDataInputStream::ReadString()

 {
 {

-  char i_strg[255];
+  size_t len;

 
 

-  if (!m_parent_i_stream)
-    return "";
+  len = Read32();

 
 

-  // TODO: Implement ReadLine
-  return i_strg;
+  if (len > 0)
+  {
+#if wxUSE_UNICODE
+    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( wxStringBuffer(ret, len), len);
+#endif
+    return ret;
+  }
+  else
+    return wxEmptyString;

 }
 
 }
 

-wxString wxDataInputStream::ReadString()
+void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)

 {
 {

-  wxString wx_string;
-  char *string;
-  unsigned long len;
-
-  if (!m_parent_i_stream)
-    return "";
-
-  len = Read32();
-  string = new char[len+1];
+  m_input->Read(buffer, size * 8);
+
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint64 v = wxUINT64_SWAP_ON_LE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint64 v = wxUINT64_SWAP_ON_BE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+}

 
 

-  Read(string, len);
+void wxDataInputStream::Read32(wxUint32 *buffer, size_t size)
+{
+  m_input->Read(buffer, size * 4);
+
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+else
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+}

 
 

-  string[len] = 0;
-  wx_string = string;
-  delete string;
+void wxDataInputStream::Read16(wxUint16 *buffer, size_t size)
+{
+  m_input->Read(buffer, size * 2);
+
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint16 v = wxUINT16_SWAP_ON_LE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint16 v = wxUINT16_SWAP_ON_BE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+}

 
 

-  return wx_string; 
+void wxDataInputStream::Read8(wxUint8 *buffer, size_t size)
+{
+  m_input->Read(buffer, size);

 }
 
 }
 

-wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
- : wxFilterOutputStream(s)
+void wxDataInputStream::ReadDouble(double *buffer, size_t size)

 {
 {

+  for (wxUint32 i=0; i<size; i++)
+  {
+    *(buffer++) = ReadDouble();
+  }

 }
 
 }
 

-wxDataOutputStream::~wxDataOutputStream()
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)

 {
 {

+  s = ReadString();
+  return *this;

 }
 
 }
 

-void wxDataOutputStream::Write32(unsigned long i)
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)

 {
 {

-  char buf[4];
+  c = (wxInt8)Read8();
+  return *this;
+}

 
 

-  if (!m_parent_o_stream)
-    return;
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
+{
+  i = (wxInt16)Read16();
+  return *this;
+}

 
 

-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  buf[2] = (i >> 16) & 0xff;
-  buf[3] = (i >> 24) & 0xff;
-  Write(buf, 4);
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+  i = (wxInt32)Read32();
+  return *this;

 }
 
 }
 

-void wxDataOutputStream::Write16(unsigned short i)
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)

 {
 {

-  char buf[2];
+  c = Read8();
+  return *this;
+}

 
 

-  if (!m_parent_o_stream)
-    return;
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+  i = Read16();
+  return *this;
+}

 
 

-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  Write(buf, 2);
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+  i = Read32();
+  return *this;

 }
 
 }
 

-void wxDataOutputStream::Write8(unsigned char i)
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)

 {
 {

-  if (!m_parent_o_stream)
-    return;
+  i = Read64();
+  return *this;
+}

 
 

-  Write(&i, 1);
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+  i = ReadDouble();
+  return *this;

 }
 
 }
 

-void wxDataOutputStream::WriteLine(const wxString& line)
+wxDataInputStream& wxDataInputStream::operator>>(float& f)

 {
 {

-#ifdef __WXMSW__
-  wxString tmp_string = line + "\r\n";
+  f = (float)ReadDouble();
+  return *this;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
+  : m_output(&s), m_be_order(false), m_conv(conv)

 #else
 #else

-  wxString tmp_string = line + '\n';
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+  : m_output(&s), m_be_order(false)

 #endif
 #endif

+{
+}

 
 

-  if (!m_parent_o_stream)
-    return;
+void wxDataOutputStream::Write64(wxUint64 i)
+{
+  wxUint64 i64;

 
 

-  Write((const char *) tmp_string, tmp_string.Length());
+  if (m_be_order)
+    i64 = wxUINT64_SWAP_ON_LE(i);
+  else
+    i64 = wxUINT64_SWAP_ON_BE(i);
+  m_output->Write(&i64, 8);

 }
 
 }
 

-void wxDataOutputStream::WriteString(const wxString& string)
+void wxDataOutputStream::Write32(wxUint32 i)

 {
 {

-  if (!m_parent_o_stream)
-    return;
+  wxUint32 i32;
+
+  if (m_be_order)
+    i32 = wxUINT32_SWAP_ON_LE(i);
+  else
+    i32 = wxUINT32_SWAP_ON_BE(i);
+  m_output->Write(&i32, 4);
+}

 
 

-  Write32(string.Length());
-  Write((const char *) string, string.Length());
+void wxDataOutputStream::Write16(wxUint16 i)
+{
+  wxUint16 i16;
+
+  if (m_be_order)
+    i16 = wxUINT16_SWAP_ON_LE(i);
+  else
+    i16 = wxUINT16_SWAP_ON_BE(i);
+
+  m_output->Write(&i16, 2);
+}
+
+void wxDataOutputStream::Write8(wxUint8 i)
+{
+  m_output->Write(&i, 1);
+}
+
+void wxDataOutputStream::WriteString(const wxString& string)
+{
+#if wxUSE_UNICODE
+  const wxWX2MBbuf buf = string.mb_str(m_conv);
+#else
+  const wxWX2MBbuf buf = string.mb_str();
+#endif
+  size_t len = strlen(buf);
+  Write32(len);
+  if (len > 0)
+      m_output->Write(buf, len);

 }
 
 // Must be at global scope for VC++ 5
 }
 
 // Must be at global scope for VC++ 5


@@ -202,14 +332,163 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
 {
   char buf[10];
 

-  if (!m_parent_o_stream)
-    return;
-
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else

-#      pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"
- buf[0] = '\0';
+#if !defined(__VMS__) && !defined(__GNUG__)
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';

 #endif
 #endif

-  Write(buf, 10);
+  m_output->Write(buf, 10);
+}
+
+void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size)
+{
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint64 i64 = wxUINT64_SWAP_ON_LE(*buffer);
+      buffer++;
+      m_output->Write(&i64, 8);
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint64 i64 = wxUINT64_SWAP_ON_BE(*buffer);
+      buffer++;
+      m_output->Write(&i64, 8);
+    }
+  }
+}
+
+void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size)
+{
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint32 i32 = wxUINT32_SWAP_ON_LE(*buffer);
+      buffer++;
+      m_output->Write(&i32, 4);
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint32 i32 = wxUINT32_SWAP_ON_BE(*buffer);
+      buffer++;
+      m_output->Write(&i32, 4);
+    }
+  }
+}
+
+void wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size)
+{
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint16 i16 = wxUINT16_SWAP_ON_LE(*buffer);
+      buffer++;
+      m_output->Write(&i16, 2);
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint16 i16 = wxUINT16_SWAP_ON_BE(*buffer);
+      buffer++;
+      m_output->Write(&i16, 2);
+    }
+  }
+}
+
+void wxDataOutputStream::Write8(const wxUint8 *buffer, size_t size)
+{
+  m_output->Write(buffer, size);
+}
+
+void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
+{
+  for (wxUint32 i=0; i<size; i++)
+  {
+    WriteDouble(*(buffer++));
+  }
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+{
+  Write32(wxStrlen(string));
+  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
+{
+  WriteString(string);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
+{
+  Write8((wxUint8)c);
+  return *this;

 }
 }

+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
+{
+  Write16((wxUint16)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
+{
+  Write32((wxUint32)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
+{
+  Write8(c);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
+{
+  Write16(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
+{
+  Write32(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
+{
+  Write64(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+{
+  WriteDouble(f);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(float f)
+{
+  WriteDouble((double)f);
+  return *this;
+}
+
+#endif
+  // wxUSE_STREAMS
+