X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e7c2aa5822f9a6e97d8d7848b95ea2eadcd98b..68abfefc451b6c8a67e8fbd79e5009cf656bde34:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index fa1eaa7d89..befc354784 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -17,24 +17,19 @@ #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" -/* -#if !USE_SHARED_LIBRARY -IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream) -IMPLEMENT_CLASS(wxDataOutputStream, wxFilterOutputStream) -#endif -*/ +// --------------------------------------------------------------------------- +// wxDataInputStream +// --------------------------------------------------------------------------- wxDataInputStream::wxDataInputStream(wxInputStream& s) - : wxFilterInputStream(s) + : m_input(&s), m_be_order(FALSE) { } @@ -42,34 +37,36 @@ wxDataInputStream::~wxDataInputStream() { } -unsigned long wxDataInputStream::Read32() +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 @@ -77,24 +74,16 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); double wxDataInputStream::ReadDouble() { -#if USE_APPLE_IEEE +#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 i_strg[255]; - - // TODO: Implement ReadLine - return i_strg; -} - wxString wxDataInputStream::ReadString() { wxString wx_string; @@ -104,64 +93,115 @@ wxString wxDataInputStream::ReadString() len = Read32(); string = new char[len+1]; - Read(string, len); + m_input->Read(string, len); string[len] = 0; wx_string = string; delete string; - return wx_string; + return wx_string; +} + +wxDataInputStream& wxDataInputStream::operator>>(wxString& s) +{ + s = ReadString(); + return *this; } -wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) - : wxFilterOutputStream(s) +wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c) { + c = (wxInt8)Read8(); + return *this; } -wxDataOutputStream::~wxDataOutputStream() +wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i) { + i = (wxInt16)Read16(); + return *this; } -void wxDataOutputStream::Write32(unsigned long i) +wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i) { - char buf[4]; + i = (wxInt32)Read32(); + return *this; +} - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - buf[2] = (i >> 16) & 0xff; - buf[3] = (i >> 24) & 0xff; - Write(buf, 4); +wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c) +{ + c = Read8(); + return *this; } -void wxDataOutputStream::Write16(unsigned short i) +wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i) { - char buf[2]; + i = Read16(); + return *this; +} - buf[0] = i & 0xff; - buf[1] = (i >> 8) & 0xff; - Write(buf, 2); +wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i) +{ + i = Read32(); + return *this; } -void wxDataOutputStream::Write8(unsigned char i) +wxDataInputStream& wxDataInputStream::operator>>(double& i) { - Write(&i, 1); + i = ReadDouble(); + return *this; } -void wxDataOutputStream::WriteLine(const wxString& line) +wxDataInputStream& wxDataInputStream::operator>>(float& f) { -#ifdef __WXMSW__ - wxString tmp_string = line + "\r\n"; -#else - wxString tmp_string = line + '\n'; -#endif + f = (float)ReadDouble(); + return *this; +} + +// --------------------------------------------------------------------------- +// wxDataOutputStream +// --------------------------------------------------------------------------- + +wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) + : m_output(&s), m_be_order(FALSE) +{ +} + +wxDataOutputStream::~wxDataOutputStream() +{ +} + +void wxDataOutputStream::Write32(wxUint32 i) +{ + wxUint32 i32; + + 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) +{ + wxUint16 i16; + + if (m_be_order) + i16 = wxUINT16_SWAP_ON_LE(i); + else + i16 = wxUINT16_SWAP_ON_BE(i); + + m_output->Write(&i16, 2); +} - Write((const char *) tmp_string, tmp_string.Length()); +void wxDataOutputStream::Write8(wxUint8 i) +{ + m_output->Write(&i, 1); } void wxDataOutputStream::WriteString(const wxString& string) { + const wxWX2MBbuf buf = string.mb_str(); Write32(string.Length()); - Write((const char *) string, string.Length()); + m_output->Write(buf, string.Len()); } // Must be at global scope for VC++ 5 @@ -171,11 +211,76 @@ void wxDataOutputStream::WriteDouble(double d) { char buf[10]; -#if USE_APPLE_IEEE +#if wxUSE_APPLE_IEEE ConvertToIeeeExtended(d, (unsigned char *)buf); #else -# pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!" +# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" 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<<(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<<(double f) +{ + WriteDouble(f); + return *this; +} + +wxDataOutputStream& wxDataOutputStream::operator<<(float f) +{ + WriteDouble((double)f); + return *this; +} + +#endif + // wxUSE_STREAMS +