X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf44735628cecb0326b953c4872260f223fc8769..be25e4809325d89075f6477025e02706137e6ffd:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 048b3c50dc..2ea158faae 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -17,156 +17,272 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_STREAMS
 
 #include "wx/datstrm.h"
 
-wxDataStream::wxDataStream(istream& s)
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
+
+wxDataInputStream::wxDataInputStream(wxInputStream& s)
+  : m_input(&s), m_be_order(FALSE)
 {
-  m_istream = &s;
-  m_ostream = NULL;
 }
 
-wxDataStream::wxDataStream(ostream& s)
+wxDataInputStream::~wxDataInputStream()
 {
-  m_istream = NULL;
-  m_ostream = &s;
 }
 
-wxDataStream::wxDataStream(iostream& s)
+wxUint32 wxDataInputStream::Read32()
 {
-  m_istream = &s;
-  m_ostream = &s;
+  wxUint32 i32;
+
+  m_input->Read(&i32, 4);
+
+  if (m_be_order)
+    return wxUINT32_SWAP_ON_LE(i32);
+  else
+    return wxUINT32_SWAP_ON_BE(i32);
 }
 
-wxDataStream::~wxDataStream()
+wxUint16 wxDataInputStream::Read16()
 {
+  wxUint16 i16;
+
+  m_input->Read(&i16, 2);
+
+  if (m_be_order)
+    return wxUINT16_SWAP_ON_LE(i16);
+  else
+    return wxUINT16_SWAP_ON_BE(i16);
 }
 
-unsigned long wxDataStream::Read32()
+wxUint8 wxDataInputStream::Read8()
 {
-  char buf[4];
+  wxUint8 buf;
+
+  m_input->Read(&buf, 1);
+  return (wxUint8)buf;
+}
 
-  if (!m_istream)
-    return 0;
+// Must be at global scope for VC++ 5
+extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
-  m_istream->read(buf, 4);
+double wxDataInputStream::ReadDouble()
+{
+#if wxUSE_APPLE_IEEE
+  char buf[10];
 
-  return (unsigned long)buf[0] |
-         ((unsigned long)buf[1] << 8) |
-         ((unsigned long)buf[2] << 16) |
-         ((unsigned long)buf[3] << 24);
+  m_input->Read(buf, 10);
+  return ConvertFromIeeeExtended((unsigned char *)buf);
+#else
+  return 0.0;
+#endif
 }
 
-unsigned short wxDataStream::Read16()
+wxString wxDataInputStream::ReadString()
 {
-  char buf[2];
+  wxString wx_string;
+  char *string;
+  unsigned long len;
 
-  if (!m_istream)
-    return 0;
+  len = Read32();
+  string = new char[len+1];
 
-  m_istream->read(buf, 2);
+  m_input->Read(string, len);
+
+  string[len] = 0;
+  wx_string = string;
+  delete string;
+
+  return wx_string;
+}
+  
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
+{
+  s = ReadString();
+  return *this;
+}
 
-  return (unsigned short)buf[0] |
-         ((unsigned short)buf[1] << 8);
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
+{
+  c = (wxInt8)Read8();
+  return *this;
 }
 
-unsigned char wxDataStream::Read8()
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
 {
-  char buf;
+  i = (wxInt16)Read16();
+  return *this;
+}
 
-  if (!m_istream)
-    return 0;
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+  i = (wxInt32)Read32();
+  return *this;
+}
 
-  m_istream->read(&buf, 1);
-  return (unsigned char)buf;
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
+{
+  c = Read8();
+  return *this;
 }
 
-double wxDataStream::ReadDouble()
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
 {
-  extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
+  i = Read16();
+  return *this;
+}
 
-#if USE_APPLE_IEEE
-  char buf[10];
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+  i = Read32();
+  return *this;
+}
 
-  if (!m_istream)
-    return 0.0;
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+  i = ReadDouble();
+  return *this;
+}
 
-  m_istream->read(buf, 10);
-  return ConvertFromIeeeExtended((unsigned char *)buf);
-#else
-  return 0.0;
-#endif
+wxDataInputStream& wxDataInputStream::operator>>(float& f)
+{
+  f = (float)ReadDouble();
+  return *this;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+  : m_output(&s), m_be_order(FALSE)
+{
 }
 
-wxString wxDataStream::ReadLine()
+wxDataOutputStream::~wxDataOutputStream()
 {
-  char i_strg[255];
+}
 
-  if (!m_istream)
-    return "";
+void wxDataOutputStream::Write32(wxUint32 i)
+{
+  wxUint32 i32;
 
-  m_istream->getline(i_strg, 255);
-  return i_strg;
+  if (m_be_order)
+    i32 = wxUINT32_SWAP_ON_LE(i);
+  else
+    i32 = wxUINT32_SWAP_ON_BE(i);
+  m_output->Write(&i32, 4);
 }
 
-void wxDataStream::Write32(unsigned long i)
+void wxDataOutputStream::Write16(wxUint16 i)
 {
-  char buf[4];
+  wxUint16 i16;
 
-  if (!m_ostream)
-    return;
+  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);
+}
 
-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  buf[2] = (i >> 16) & 0xff;
-  buf[3] = (i >> 24) & 0xff;
-  m_ostream->write(buf, 4);
+void wxDataOutputStream::WriteString(const wxString& string)
+{
+  const wxWX2MBbuf buf = string.mb_str();
+  Write32(string.Length());
+  m_output->Write(buf, string.Len());
 }
 
-void wxDataStream::Write16(unsigned short i)
+// Must be at global scope for VC++ 5
+extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
+
+void wxDataOutputStream::WriteDouble(double d)
 {
-  char buf[2];
+  char buf[10];
+
+#if wxUSE_APPLE_IEEE
+  ConvertToIeeeExtended(d, (unsigned char *)buf);
+#else
+#ifndef __VMS__
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';
+#endif
+  m_output->Write(buf, 10);
+}
 
-  if (!m_ostream)
-    return;
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+{
+  Write32(wxStrlen(string));
+  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
+  return *this;
+}
 
-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  m_ostream->write(buf, 2);
+wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+{
+  WriteString(string);
+  return *this;
 }
 
-void wxDataStream::Write8(unsigned char i)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
 {
-  if (!m_ostream)
-    return;
+  Write8((wxUint8)c);
+  return *this;
+}
 
-  m_ostream->write(&i, 1);
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
+{
+  Write16((wxUint16)i);
+  return *this;
 }
 
-void wxDataStream::WriteLine(const wxString& line)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
 {
-  wxString tmp_string = line + '\n';
+  Write32((wxUint32)i);
+  return *this;
+}
 
-  if (!m_ostream)
-    return;
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
+{
+  Write8(c);
+  return *this;
+}
 
-  m_ostream->write((const char *) tmp_string, tmp_string.Length());
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
+{
+  Write16(i);
+  return *this;
 }
 
-void wxDataStream::WriteDouble(double d)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
 {
-  extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes)
-  char buf[10];
+  Write32(i);
+  return *this;
+}
 
-  if (!m_ostream)
-    return;
+wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+{
+  WriteDouble(f);
+  return *this;
+}
 
-  ConvertToIeeeExtended(d, (unsigned char *)buf);
-  m_ostream->write(buf, 10);
+wxDataOutputStream& wxDataOutputStream::operator<<(float f)
+{
+  WriteDouble((double)f);
+  return *this;
 }
+
+#endif
+  // wxUSE_STREAMS
+