// Modified by:
// Created: 28/06/98
// RCS-ID: $Id$
-// Copyright: (c) Guilhem Lavaux
+// Copyright: (c) Guilhem Lavaux
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
-#endif
-
#if wxUSE_STREAMS
#include "wx/datstrm.h"
// ---------------------------------------------------------------------------
wxDataInputStream::wxDataInputStream(wxInputStream& s)
- : wxFilterInputStream(s)
+ : m_input(&s), m_be_order(FALSE)
{
}
{
}
-unsigned long wxDataInputStream::Read32()
+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);
+}
+
+wxUint32 wxDataInputStream::Read32()
{
- char buf[4];
+ 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;
- 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 wxDataInputStream::Read8()
+wxUint8 wxDataInputStream::Read8()
{
- char buf;
+ 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
#if wxUSE_APPLE_IEEE
char buf[10];
- Read(buf, 10);
+ m_input->Read(buf, 10);
return ConvertFromIeeeExtended((unsigned char *)buf);
#else
return 0.0;
#endif
}
-wxString wxDataInputStream::ReadLine()
-{
- char c, last_endl = 0;
- bool end_line = FALSE;
- wxString line;
-
- while (!end_line) {
- c = GetC();
- switch (c) {
- case '\n':
- end_line = TRUE;
- break;
- case '\r':
- last_endl = '\r';
- break;
- default:
- if (last_endl == '\r') {
- end_line = TRUE;
- InputStreamBuffer()->WriteBack(c);
- break;
- }
- line += c;
- break;
- }
+wxString wxDataInputStream::ReadString()
+{
+ size_t len;
+
+ len = Read32();
+
+ 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;
}
- return line;
+ else
+ return wxEmptyString;
}
-wxString wxDataInputStream::ReadString()
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
{
- wxString wx_string;
- char *string;
- unsigned long len;
+ s = ReadString();
+ return *this;
+}
- len = Read32();
- string = new char[len+1];
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
+{
+ c = (wxInt8)Read8();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
+{
+ i = (wxInt16)Read16();
+ return *this;
+}
+
+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;
+}
- Read(string, len);
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+ i = Read32();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+ i = Read64();
+ return *this;
+}
- string[len] = 0;
- wx_string = string;
- delete string;
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+ i = ReadDouble();
+ return *this;
+}
- return wx_string;
+wxDataInputStream& wxDataInputStream::operator>>(float& f)
+{
+ f = (float)ReadDouble();
+ return *this;
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
- : wxFilterOutputStream(s)
+ : m_output(&s), m_be_order(FALSE)
{
}
{
}
-void wxDataOutputStream::Write32(unsigned long i)
+void wxDataOutputStream::Write64(wxUint64 i)
{
- char buf[4];
+ wxUint64 i64;
- buf[0] = i & 0xff;
- buf[1] = (i >> 8) & 0xff;
- buf[2] = (i >> 16) & 0xff;
- buf[3] = (i >> 24) & 0xff;
- Write(buf, 4);
+ if (m_be_order)
+ i64 = wxUINT64_SWAP_ON_LE(i);
+ else
+ i64 = wxUINT64_SWAP_ON_BE(i);
+ m_output->Write(&i64, 8);
}
-void wxDataOutputStream::Write16(unsigned short i)
+void wxDataOutputStream::Write32(wxUint32 i)
{
- char buf[2];
+ wxUint32 i32;
- buf[0] = i & 0xff;
- buf[1] = (i >> 8) & 0xff;
- Write(buf, 2);
+ if (m_be_order)
+ i32 = wxUINT32_SWAP_ON_LE(i);
+ else
+ i32 = wxUINT32_SWAP_ON_BE(i);
+ m_output->Write(&i32, 4);
}
-void wxDataOutputStream::Write8(unsigned char i)
+void wxDataOutputStream::Write16(wxUint16 i)
{
- Write(&i, 1);
+ 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::WriteLine(const wxString& line)
+void wxDataOutputStream::Write8(wxUint8 i)
{
-#ifdef __WXMSW__
- wxString tmp_string = line + _T("\r\n");
-#else
- wxString tmp_string = line + _T('\n');
-#endif
-
- Write((const wxChar *) tmp_string, tmp_string.Length()*sizeof(wxChar));
+ m_output->Write(&i, 1);
}
void wxDataOutputStream::WriteString(const wxString& string)
{
- Write32(string.Length());
- Write((const wxChar *) string, string.Length()*sizeof(wxChar));
+ 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
#if wxUSE_APPLE_IEEE
ConvertToIeeeExtended(d, (unsigned char *)buf);
#else
-# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
- buf[0] = '\0';
+#ifndef __VMS__
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+ buf[0] = '\0';
#endif
- Write(buf, 10);
+ 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
-
\ No newline at end of file
+
projects / wxWidgets.git / blobdiff