X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 2ea158faae..0a02f17e8f 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -2,17 +2,13 @@ // 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__ -#pragma implementation "datstrm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,18 +19,32 @@ #if wxUSE_STREAMS #include "wx/datstrm.h" +#include "wx/math.h" // --------------------------------------------------------------------------- // 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) + : 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() @@ -69,16 +79,13 @@ wxUint8 wxDataInputStream::Read8() return (wxUint8)buf; } -// Must be at global scope for VC++ 5 -extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); - double wxDataInputStream::ReadDouble() { #if wxUSE_APPLE_IEEE char buf[10]; m_input->Read(buf, 10); - return ConvertFromIeeeExtended((unsigned char *)buf); + return ConvertFromIeeeExtended((const wxInt8 *)buf); #else return 0.0; #endif @@ -86,22 +93,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; iRead(buffer, size * 4); + + if (m_be_order) + { + for (wxUint32 i=0; iRead(buffer, size * 2); + + if (m_be_order) + { + for (wxUint32 i=0; iRead(buffer, size); +} - return wx_string; +void wxDataInputStream::ReadDouble(double *buffer, size_t size) +{ + for (wxUint32 i=0; i>(wxString& s) { s = ReadString(); @@ -144,6 +235,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,13 +257,25 @@ 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) + : 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) @@ -199,22 +308,25 @@ 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 -extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes); - void wxDataOutputStream::WriteDouble(double d) { char buf[10]; #if wxUSE_APPLE_IEEE - ConvertToIeeeExtended(d, (unsigned char *)buf); + ConvertToIeeeExtended(d, (wxInt8 *)buf); #else -#ifndef __VMS__ +#if !defined(__VMS__) && !defined(__GNUG__) # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" #endif buf[0] = '\0'; @@ -222,6 +334,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; iWrite(&i64, 8); + } + } + else + { + for (wxUint32 i=0; iWrite(&i64, 8); + } + } +} + +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 wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size) +{ + if (m_be_order) + { + for (wxUint32 i=0; iWrite(&i16, 2); + } + } + else + { + for (wxUint32 i=0; iWrite(&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