X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..e0176dd9fb716ad0a1a8804f0a93e16048f09054:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 2ea158faae..1580055ca7 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -2,14 +2,14 @@ // 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 @@ -28,8 +28,13 @@ // 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_be_order(FALSE) +#endif { } @@ -37,6 +42,18 @@ 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() { wxUint32 i32; @@ -86,22 +103,106 @@ double wxDataInputStream::ReadDouble() 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); + 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; + } + } +} - string[len] = 0; - wx_string = string; - delete string; +void wxDataInputStream::Read8(wxUint8 *buffer, size_t size) +{ + m_input->Read(buffer, size); +} - return wx_string; +void wxDataInputStream::ReadDouble(double *buffer, size_t size) +{ + for (wxUint32 i=0; i<size; i++) + { + *(buffer++) = ReadDouble(); + } } - + wxDataInputStream& wxDataInputStream::operator>>(wxString& s) { s = ReadString(); @@ -144,6 +245,12 @@ wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i) return *this; } +wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i) +{ + i = Read64(); + return *this; +} + wxDataInputStream& wxDataInputStream::operator>>(double& i) { i = ReadDouble(); @@ -160,8 +267,13 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f) // 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_be_order(FALSE) +#endif { } @@ -169,6 +281,17 @@ 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) { wxUint32 i32; @@ -199,9 +322,15 @@ 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 @@ -222,6 +351,85 @@ void wxDataOutputStream::WriteDouble(double d) 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)); @@ -229,7 +437,7 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string) return *this; } -wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string) +wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string) { WriteString(string); return *this; @@ -271,6 +479,12 @@ wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i) return *this; } +wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i) +{ + Write64(i); + return *this; +} + wxDataOutputStream& wxDataOutputStream::operator<<(double f) { WriteDouble(f); @@ -285,4 +499,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f) #endif // wxUSE_STREAMS - +