// Name: datstrm.cpp
// Purpose: Data stream classes
// Author: Guilhem Lavaux
-// Modified by:
+// Modified by: Mickael Gilabert
// 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
// 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)
- : m_input(&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);
}
wxUint32 wxDataInputStream::Read32()
{
- char buf[4];
+ wxUint32 i32;
- m_input->Read(buf, 4);
+ m_input->Read(&i32, 4);
- return (wxUint32)buf[0] |
- ((wxUint32)buf[1] << 8) |
- ((wxUint32)buf[2] << 16) |
- ((wxUint32)buf[3] << 24);
+ if (m_be_order)
+ return wxUINT32_SWAP_ON_LE(i32);
+ else
+ return wxUINT32_SWAP_ON_BE(i32);
}
wxUint16 wxDataInputStream::Read16()
{
- char buf[2];
+ wxUint16 i16;
- m_input->Read(buf, 2);
+ m_input->Read(&i16, 2);
- return (wxUint16)buf[0] |
- ((wxUint16)buf[1] << 8);
+ if (m_be_order)
+ return wxUINT16_SWAP_ON_LE(i16);
+ else
+ return wxUINT16_SWAP_ON_BE(i16);
}
wxUint8 wxDataInputStream::Read8()
{
wxUint8 buf;
- m_input->Read((char *)&buf, 1);
+ m_input->Read(&buf, 1);
return (wxUint8)buf;
}
wxString wxDataInputStream::ReadString()
{
- wxString wx_string;
- char *string;
- unsigned long len;
+ size_t len;
len = Read32();
- string = new char[len+1];
- m_input->Read(string, len);
-
- string[len] = 0;
- wx_string = string;
- delete string;
-
- return wx_string;
+ 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;
+}
+
+void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
+{
+ 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;
+ }
+ }
+}
+
+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;
+ }
+ }
+}
+
+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;
+ }
+ }
+}
+
+void wxDataInputStream::Read8(wxUint8 *buffer, size_t size)
+{
+ m_input->Read(buffer, size);
+}
+
+void wxDataInputStream::ReadDouble(double *buffer, size_t size)
+{
+ for (wxUint32 i=0; i<size; i++)
+ {
+ *(buffer++) = ReadDouble();
+ }
}
-
+
wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
{
s = ReadString();
return *this;
}
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+ i = Read64();
+ return *this;
+}
+
wxDataInputStream& wxDataInputStream::operator>>(double& i)
{
i = ReadDouble();
// wxDataOutputStream
// ---------------------------------------------------------------------------
+#if wxUSE_UNICODE
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
+ : m_output(&s), m_be_order(false), m_conv(conv)
+#else
wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
- : m_output(&s)
+ : m_output(&s), m_be_order(false)
+#endif
{
}
-wxDataOutputStream::~wxDataOutputStream()
+void wxDataOutputStream::Write64(wxUint64 i)
{
+ wxUint64 i64;
+
+ if (m_be_order)
+ i64 = wxUINT64_SWAP_ON_LE(i);
+ else
+ i64 = wxUINT64_SWAP_ON_BE(i);
+ m_output->Write(&i64, 8);
}
void wxDataOutputStream::Write32(wxUint32 i)
{
- char buf[4];
+ wxUint32 i32;
- buf[0] = i & 0xff;
- buf[1] = (i >> 8) & 0xff;
- buf[2] = (i >> 16) & 0xff;
- buf[3] = (i >> 24) & 0xff;
- m_output->Write(buf, 4);
+ if (m_be_order)
+ i32 = wxUINT32_SWAP_ON_LE(i);
+ else
+ i32 = wxUINT32_SWAP_ON_BE(i);
+ m_output->Write(&i32, 4);
}
void wxDataOutputStream::Write16(wxUint16 i)
{
- char buf[2];
+ wxUint16 i16;
- buf[0] = i & 0xff;
- buf[1] = (i >> 8) & 0xff;
- m_output->Write(buf, 2);
+ 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)
void wxDataOutputStream::WriteString(const wxString& string)
{
+#if wxUSE_UNICODE
+ const wxWX2MBbuf buf = string.mb_str(m_conv);
+#else
const wxWX2MBbuf buf = string.mb_str();
- Write32(string.Length());
- m_output->Write(buf, string.Len());
+#endif
+ size_t len = strlen(buf);
+ Write32(len);
+ if (len > 0)
+ m_output->Write(buf, 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';
+#if !defined(__VMS__) && !defined(__GNUG__)
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+ buf[0] = '\0';
#endif
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));
return *this;
}
-wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
{
WriteString(string);
return *this;
return *this;
}
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
+{
+ Write64(i);
+ return *this;
+}
+
wxDataOutputStream& wxDataOutputStream::operator<<(double f)
{
WriteDouble(f);
#endif
// wxUSE_STREAMS
-
+
projects / wxWidgets.git / blobdiff