X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf44735628cecb0326b953c4872260f223fc8769..0f314c30b8c4ffbd7d87146f72be7a061d506235:/src/common/datstrm.cpp?ds=inline diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 048b3c50dc..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 @@ -17,156 +17,486 @@ #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 +// --------------------------------------------------------------------------- + +#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 { - m_istream = &s; - m_ostream = NULL; } -wxDataStream::wxDataStream(ostream& s) +wxDataInputStream::~wxDataInputStream() { - m_istream = NULL; - m_ostream = &s; } -wxDataStream::wxDataStream(iostream& s) +wxUint64 wxDataInputStream::Read64() { - m_istream = &s; - m_ostream = &s; + wxUint64 i64; + + m_input->Read(&i64, 8); + + if (m_be_order) + return wxUINT64_SWAP_ON_LE(i64); + else + return wxUINT64_SWAP_ON_BE(i64); } -wxDataStream::~wxDataStream() +wxUint32 wxDataInputStream::Read32() { + wxUint32 i32; + + m_input->Read(&i32, 4); + + if (m_be_order) + return wxUINT32_SWAP_ON_LE(i32); + else + return wxUINT32_SWAP_ON_BE(i32); } -unsigned long wxDataStream::Read32() +wxUint16 wxDataInputStream::Read16() { - char buf[4]; + wxUint16 i16; - if (!m_istream) - return 0; + m_input->Read(&i16, 2); - m_istream->read(buf, 4); + if (m_be_order) + return wxUINT16_SWAP_ON_LE(i16); + else + return wxUINT16_SWAP_ON_BE(i16); +} + +wxUint8 wxDataInputStream::Read8() +{ + wxUint8 buf; - return (unsigned long)buf[0] | - ((unsigned long)buf[1] << 8) | - ((unsigned long)buf[2] << 16) | - ((unsigned long)buf[3] << 24); + m_input->Read(&buf, 1); + return (wxUint8)buf; } -unsigned short wxDataStream::Read16() +// Must be at global scope for VC++ 5 +extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); + +double wxDataInputStream::ReadDouble() { - char buf[2]; +#if wxUSE_APPLE_IEEE + char buf[10]; - if (!m_istream) - return 0; + m_input->Read(buf, 10); + return ConvertFromIeeeExtended((unsigned char *)buf); +#else + return 0.0; +#endif +} + +wxString wxDataInputStream::ReadString() +{ + size_t len; - m_istream->read(buf, 2); + len = Read32(); - return (unsigned short)buf[0] | - ((unsigned short)buf[1] << 8); + 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; } -unsigned char wxDataStream::Read8() +void wxDataInputStream::Read64(wxUint64 *buffer, size_t size) { - char buf; + m_input->Read(buffer, size * 8); + + if (m_be_order) + { + for (wxUint32 i=0; iRead(buffer, size * 4); + + if (m_be_order) + { + for (wxUint32 i=0; iread(&buf, 1); - return (unsigned char)buf; +void wxDataInputStream::Read16(wxUint16 *buffer, size_t size) +{ + m_input->Read(buffer, size * 2); + + if (m_be_order) + { + for (wxUint32 i=0; iRead(buffer, size); +} -#if USE_APPLE_IEEE - char buf[10]; +void wxDataInputStream::ReadDouble(double *buffer, size_t size) +{ + for (wxUint32 i=0; i>(wxString& s) +{ + s = ReadString(); + return *this; +} - m_istream->read(buf, 10); - return ConvertFromIeeeExtended((unsigned char *)buf); +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; +} + +wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i) +{ + i = Read32(); + return *this; +} + +wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i) +{ + i = Read64(); + return *this; +} + +wxDataInputStream& wxDataInputStream::operator>>(double& i) +{ + i = ReadDouble(); + return *this; +} + +wxDataInputStream& wxDataInputStream::operator>>(float& f) +{ + f = (float)ReadDouble(); + return *this; +} + +// --------------------------------------------------------------------------- +// wxDataOutputStream +// --------------------------------------------------------------------------- + +#if wxUSE_UNICODE +wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv) + : m_output(&s), m_be_order(FALSE), m_conv(conv) #else - return 0.0; +wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) + : m_output(&s), m_be_order(FALSE) #endif +{ +} + +wxDataOutputStream::~wxDataOutputStream() +{ } -wxString wxDataStream::ReadLine() +void wxDataOutputStream::Write64(wxUint64 i) { - char i_strg[255]; + wxUint64 i64; + + if (m_be_order) + i64 = wxUINT64_SWAP_ON_LE(i); + else + i64 = wxUINT64_SWAP_ON_BE(i); + m_output->Write(&i64, 8); +} - 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); - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - buf[2] = (i >> 16) & 0xff; - buf[3] = (i >> 24) & 0xff; - m_ostream->write(buf, 4); + m_output->Write(&i16, 2); } -void wxDataStream::Write16(unsigned short i) +void wxDataOutputStream::Write8(wxUint8 i) { - char buf[2]; + m_output->Write(&i, 1); +} + +void wxDataOutputStream::WriteString(const wxString& string) +{ +#if wxUSE_UNICODE + const wxWX2MBbuf buf = string.mb_str(m_conv); +#else + const wxWX2MBbuf buf = string.mb_str(); +#endif + size_t len = strlen(buf); + Write32(len); + if (len > 0) + m_output->Write(buf, len); +} + +// Must be at global scope for VC++ 5 +extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes); - if (!m_ostream) - return; +void wxDataOutputStream::WriteDouble(double d) +{ + char buf[10]; - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - m_ostream->write(buf, 2); +#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); } -void wxDataStream::Write8(unsigned char i) +void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size) { - if (!m_ostream) - return; + if (m_be_order) + { + for (wxUint32 i=0; iWrite(&i64, 8); + } + } + else + { + for (wxUint32 i=0; iWrite(&i64, 8); + } + } +} - m_ostream->write(&i, 1); +void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size) +{ + if (m_be_order) + { + for (wxUint32 i=0; iWrite(&i32, 4); + } + } + else + { + for (wxUint32 i=0; iWrite(&i32, 4); + } + } } -void wxDataStream::WriteLine(const wxString& line) +void wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size) { - wxString tmp_string = line + '\n'; + if (m_be_order) + { + for (wxUint32 i=0; iWrite(&i16, 2); + } + } + else + { + for (wxUint32 i=0; iWrite(&i16, 2); + } + } +} - if (!m_ostream) - return; +void wxDataOutputStream::Write8(const wxUint8 *buffer, size_t size) +{ + m_output->Write(buffer, size); +} - m_ostream->write((const char *) tmp_string, tmp_string.Length()); +void wxDataOutputStream::WriteDouble(const double *buffer, size_t size) +{ + for (wxUint32 i=0; iWrite((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; +} - if (!m_ostream) - return; +wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i) +{ + Write16((wxUint16)i); + return *this; +} - ConvertToIeeeExtended(d, (unsigned char *)buf); - m_ostream->write(buf, 10); +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 +