iconv-based conversion works again, after being broken for a while

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index be174c1b4819605aad5d577b449737ef48293cc2..f9f974012e97369dd51275b5be76cca4522c964f 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux

 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,193 +17,315 @@
 #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"
 

-wxDataStream::wxDataStream(istream& s)
-{
-  m_istream = &s;
-  m_ostream = NULL;
-}
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------

 
 

-wxDataStream::wxDataStream(ostream& s)
+wxDataInputStream::wxDataInputStream(wxInputStream& s)
+  : m_input(&s), m_be_order(FALSE)

 {
 {

-  m_istream = NULL;
-  m_ostream = &s;

 }
 
 }
 

-wxDataStream::wxDataStream(iostream& s)
+wxDataInputStream::~wxDataInputStream()

 {
 {

-  m_istream = &s;
-  m_ostream = &s;

 }
 
 }
 

-wxDataStream::~wxDataStream()
+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 wxDataStream::Read32()
+wxUint32 wxDataInputStream::Read32()

 {
 {

-  char buf[4];
+  wxUint32 i32;

 
 

-  if (!m_istream)
-    return 0;
+  m_input->Read(&i32, 4);

 
 

-  m_istream->read(buf, 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 wxDataStream::Read16()
+wxUint16 wxDataInputStream::Read16()

 {
 {

-  char buf[2];
-
-  if (!m_istream)
-    return 0;
+  wxUint16 i16;

 
 

-  m_istream->read(buf, 2);
+  m_input->Read(&i16, 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 wxDataStream::Read8()
+wxUint8 wxDataInputStream::Read8()

 {
 {

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

 
 

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

 }
 
 // Must be at global scope for VC++ 5
 extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 }
 
 // Must be at global scope for VC++ 5
 extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 

-double wxDataStream::ReadDouble()
+double wxDataInputStream::ReadDouble()

 {
 {

-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

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

-  if (!m_istream)
-    return 0.0;
-
-  m_istream->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 wxDataStream::ReadLine()
+wxString wxDataInputStream::ReadString()

 {
 {

-  char i_strg[255];
+  size_t len;
+
+  len = Read32();

 
 

-  if (!m_istream)
-    return "";
+  if (len > 0)
+  {
+#if wxUSE_UNICODE
+    char *tmp = new char[len + 1];
+    m_input->Read(tmp, len);
+    tmp[len] = 0;
+    wxString s(tmp);
+    delete[] tmp;
+#else
+    wxString s;
+    m_input->Read(s.GetWriteBuf(len), len);
+    s.UngetWriteBuf();
+#endif
+    return s;
+  }
+  else
+    return wxEmptyString;
+}

 
 

-  m_istream->getline(i_strg, 255);
-  return i_strg;
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
+{
+  s = ReadString();
+  return *this;

 }
 
 }
 

-wxString wxDataStream::ReadString()
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)

 {
 {

-  wxString wx_string;
-  char *string;
-  unsigned long len;
+  c = (wxInt8)Read8();
+  return *this;
+}

 
 

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

 
 

-  len = Read32();
-  string = new char[len+1];
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+  i = (wxInt32)Read32();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
+{
+  c = Read8();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+  i = Read16();
+  return *this;
+}

 
 

-  m_istream->read(string, len);
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+  i = Read32();
+  return *this;
+}

 
 

-  string[len] = 0;
-  wx_string = string;
-  delete string;
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+  i = Read64();
+  return *this;
+}

 
 

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

 }
 
 }
 

-void wxDataStream::Write32(unsigned long i)
+wxDataInputStream& wxDataInputStream::operator>>(float& f)

 {
 {

-  char buf[4];
+  f = (float)ReadDouble();
+  return *this;
+}

 
 

-  if (!m_ostream)
-    return;
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------

 
 

-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  buf[2] = (i >> 16) & 0xff;
-  buf[3] = (i >> 24) & 0xff;
-  m_ostream->write(buf, 4);
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+  : m_output(&s), m_be_order(FALSE)
+{

 }
 
 }
 

-void wxDataStream::Write16(unsigned short i)
+wxDataOutputStream::~wxDataOutputStream()

 {
 {

-  char buf[2];
+}

 
 

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

 
 

-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  m_ostream->write(buf, 2);
+  if (m_be_order)
+    i64 = wxUINT64_SWAP_ON_LE(i);
+  else
+    i64 = wxUINT64_SWAP_ON_BE(i);
+  m_output->Write(&i64, 8);

 }
 
 }
 

-void wxDataStream::Write8(unsigned char i)
+void wxDataOutputStream::Write32(wxUint32 i)

 {
 {

-  if (!m_ostream)
-    return;
+  wxUint32 i32;

 
 

-  m_ostream->write(&i, 1);
+  if (m_be_order)
+    i32 = wxUINT32_SWAP_ON_LE(i);
+  else
+    i32 = wxUINT32_SWAP_ON_BE(i);
+  m_output->Write(&i32, 4);

 }
 
 }
 

-void wxDataStream::WriteLine(const wxString& line)
+void wxDataOutputStream::Write16(wxUint16 i)

 {
 {

-#ifdef __WINDOWS__
-  wxString tmp_string = line + "\r\n";
-#else
-  wxString tmp_string = line + '\n';
-#endif
+  wxUint16 i16;

 
 

-  if (!m_ostream)
-    return;
+  if (m_be_order)
+    i16 = wxUINT16_SWAP_ON_LE(i);
+  else
+    i16 = wxUINT16_SWAP_ON_BE(i);

 
 

-  m_ostream->write((const char *) tmp_string, tmp_string.Length());
+  m_output->Write(&i16, 2);

 }
 
 }
 

-void wxDataStream::WriteString(const wxString& string)
+void wxDataOutputStream::Write8(wxUint8 i)

 {
 {

-  if (!m_ostream)
-    return;
+  m_output->Write(&i, 1);
+}

 
 

-  Write32(string.Length());
-  m_ostream->write((const char *) string, string.Length());
+void wxDataOutputStream::WriteString(const wxString& string)
+{
+  const wxWX2MBbuf buf = string.mb_str();
+  Write32(string.Len());
+  if (string.Len() > 0)
+      m_output->Write(buf, string.Len());

 }
 
 // Must be at global scope for VC++ 5
 extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
 
 }
 
 // Must be at global scope for VC++ 5
 extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
 

-void wxDataStream::WriteDouble(double d)
+void wxDataOutputStream::WriteDouble(double d)

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

-  if (!m_ostream)
-    return;
-
+#if wxUSE_APPLE_IEEE

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

-  m_ostream->write(buf, 10);
+#else
+#ifndef __VMS__
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';
+#endif
+  m_output->Write(buf, 10);
+}
+
+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
+