/////////////////////////////////////////////////////////////////////////////
-// Name: datstrm.cpp
+// Name: src/common/datstrm.cpp
// Purpose: Data stream classes
// Author: Guilhem Lavaux
// Modified by: Mickael Gilabert
// Created: 28/06/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "datstrm.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/datstrm.h"
-// ---------------------------------------------------------------------------
-// wxDataInputStream
-// ---------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/math.h"
+#endif //WX_PRECOMP
+
+namespace
+{
+// helper unions used to swap bytes of floats and doubles
+union Float32Data
+{
+ wxFloat32 f;
+ wxUint32 i;
+};
+
+union Float64Data
+{
+ wxFloat64 f;
+ wxUint32 i[2];
+};
+
+} // anonymous namespace
+
+// ----------------------------------------------------------------------------
+// wxDataStreamBase
+// ----------------------------------------------------------------------------
+
+wxDataStreamBase::wxDataStreamBase(const wxMBConv& conv)
#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_conv(conv.Clone())
+#endif // wxUSE_UNICODE
{
+ // It is unused in non-Unicode build, so suppress a warning there.
+ wxUnusedVar(conv);
+
+ m_be_order = false;
+
+ // For compatibility with the existing data files, we use extended
+ // precision if it is available, i.e. if wxUSE_APPLE_IEEE is on.
+#if wxUSE_APPLE_IEEE
+ m_useExtendedPrecision = true;
+#endif // wxUSE_APPLE_IEEE
}
-wxDataInputStream::~wxDataInputStream()
+#if wxUSE_UNICODE
+void wxDataStreamBase::SetConv( const wxMBConv &conv )
{
+ delete m_conv;
+ m_conv = conv.Clone();
}
+#endif
-wxUint64 wxDataInputStream::Read64()
+wxDataStreamBase::~wxDataStreamBase()
{
- wxUint64 i64;
+#if wxUSE_UNICODE
+ delete m_conv;
+#endif // wxUSE_UNICODE
+}
- m_input->Read(&i64, 8);
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
- if (m_be_order)
- return wxUINT64_SWAP_ON_LE(i64);
- else
- return wxUINT64_SWAP_ON_BE(i64);
+wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
+ : wxDataStreamBase(conv),
+ m_input(&s)
+{
}
+#if wxHAS_INT64
+wxUint64 wxDataInputStream::Read64()
+{
+ wxUint64 tmp;
+ Read64(&tmp, 1);
+ return tmp;
+}
+#endif // wxHAS_INT64
+
wxUint32 wxDataInputStream::Read32()
{
wxUint32 i32;
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];
+ if ( m_useExtendedPrecision )
+ {
+ char buf[10];
- m_input->Read(buf, 10);
- return ConvertFromIeeeExtended((unsigned char *)buf);
-#else
- return 0.0;
-#endif
+ m_input->Read(buf, 10);
+ return wxConvertFromIeeeExtended((const wxInt8 *)buf);
+ }
+ else
+#endif // wxUSE_APPLE_IEEE
+ {
+ Float64Data floatData;
+
+ if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) )
+ {
+ floatData.i[0] = Read32();
+ floatData.i[1] = Read32();
+ }
+ else
+ {
+ floatData.i[1] = Read32();
+ floatData.i[0] = Read32();
+ }
+
+ return static_cast<double>(floatData.f);
+ }
}
-wxString wxDataInputStream::ReadString()
+float wxDataInputStream::ReadFloat()
{
- size_t len;
+#if wxUSE_APPLE_IEEE
+ if ( m_useExtendedPrecision )
+ {
+ return (float)ReadDouble();
+ }
+ else
+#endif // wxUSE_APPLE_IEEE
+ {
+ Float32Data floatData;
- len = Read32();
+ floatData.i = Read32();
+ return static_cast<float>(floatData.f);
+ }
+}
- if (len > 0)
- {
+wxString wxDataInputStream::ReadString()
+{
+ wxString ret;
+
+ const size_t len = Read32();
+ if ( len > 0 )
+ {
#if wxUSE_UNICODE
- char *tmp = new char[len + 1];
- m_input->Read(tmp, len);
- tmp[len] = 0;
- wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) );
- delete[] tmp;
+ wxCharBuffer tmp(len);
+ if ( tmp )
+ {
+ m_input->Read(tmp.data(), len);
+ ret = m_conv->cMB2WX(tmp.data());
+ }
#else
- wxString ret;
- m_input->Read( ret.GetWriteBuf(len), len);
- ret.UngetWriteBuf();
+ wxStringBuffer buf(ret, len);
+ if ( buf )
+ m_input->Read(buf, len);
#endif
+ }
+
return ret;
- }
- else
- return wxEmptyString;
}
-void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
+#if wxUSE_LONGLONG
+
+template <class T>
+static
+void DoReadLL(T *buffer, size_t size, wxInputStream *input, bool be_order)
{
- m_input->Read(buffer, size * 8);
+ typedef T DataType;
+ unsigned char *pchBuffer = new unsigned char[size * 8];
+ // TODO: Check for overflow when size is of type uint and is > than 512m
+ input->Read(pchBuffer, size * 8);
+ size_t idx_base = 0;
+ if ( be_order )
+ {
+ for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
+ {
+ buffer[uiIndex] = 0l;
+ for ( unsigned ui = 0; ui != 8; ++ui )
+ {
+ buffer[uiIndex] = buffer[uiIndex] * 256l +
+ DataType((unsigned long) pchBuffer[idx_base + ui]);
+ }
+
+ idx_base += 8;
+ }
+ }
+ else // little endian
+ {
+ for ( size_t uiIndex=0; uiIndex!=size; ++uiIndex )
+ {
+ buffer[uiIndex] = 0l;
+ for ( unsigned ui=0; ui!=8; ++ui )
+ buffer[uiIndex] = buffer[uiIndex] * 256l +
+ DataType((unsigned long) pchBuffer[idx_base + 7 - ui]);
+ idx_base += 8;
+ }
+ }
+ delete[] pchBuffer;
+}
- if (m_be_order)
+template <class T>
+static void DoWriteLL(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
+{
+ typedef T DataType;
+ unsigned char *pchBuffer = new unsigned char[size * 8];
+ size_t idx_base = 0;
+ if ( be_order )
+ {
+ for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
+ {
+ DataType i64 = buffer[uiIndex];
+ for ( unsigned ui = 0; ui != 8; ++ui )
+ {
+ pchBuffer[idx_base + 7 - ui] =
+ (unsigned char) (i64.GetLo() & 255l);
+ i64 >>= 8l;
+ }
+
+ idx_base += 8;
+ }
+ }
+ else // little endian
+ {
+ for ( size_t uiIndex=0; uiIndex != size; ++uiIndex )
+ {
+ DataType i64 = buffer[uiIndex];
+ for (unsigned ui=0; ui!=8; ++ui)
+ {
+ pchBuffer[idx_base + ui] =
+ (unsigned char) (i64.GetLo() & 255l);
+ i64 >>= 8l;
+ }
+
+ idx_base += 8;
+ }
+ }
+
+ // TODO: Check for overflow when size is of type uint and is > than 512m
+ output->Write(pchBuffer, size * 8);
+ delete[] pchBuffer;
+}
+
+#endif // wxUSE_LONGLONG
+
+#ifdef wxLongLong_t
+
+template <class T>
+static
+void DoReadI64(T *buffer, size_t size, wxInputStream *input, bool be_order)
+{
+ typedef T DataType;
+ unsigned char *pchBuffer = (unsigned char*) buffer;
+ // TODO: Check for overflow when size is of type uint and is > than 512m
+ input->Read(pchBuffer, size * 8);
+ if ( be_order )
+ {
+ for ( wxUint32 i = 0; i < size; i++ )
+ {
+ DataType v = wxUINT64_SWAP_ON_LE(*buffer);
+ *(buffer++) = v;
+ }
+ }
+ else // little endian
+ {
+ for ( wxUint32 i=0; i<size; i++ )
+ {
+ DataType v = wxUINT64_SWAP_ON_BE(*buffer);
+ *(buffer++) = v;
+ }
+ }
+}
+
+template <class T>
+static
+void DoWriteI64(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
+{
+ typedef T DataType;
+ if ( be_order )
{
- for (wxUint32 i=0; i<size; i++)
+ for ( size_t i = 0; i < size; i++ )
{
- wxUint64 v = wxUINT64_SWAP_ON_LE(*buffer);
- *(buffer++) = v;
+ DataType i64 = wxUINT64_SWAP_ON_LE(*buffer);
+ buffer++;
+ output->Write(&i64, 8);
}
}
- else
+ else // little endian
{
- for (wxUint32 i=0; i<size; i++)
+ for ( size_t i=0; i < size; i++ )
{
- wxUint64 v = wxUINT64_SWAP_ON_BE(*buffer);
- *(buffer++) = v;
+ DataType i64 = wxUINT64_SWAP_ON_BE(*buffer);
+ buffer++;
+ output->Write(&i64, 8);
}
}
}
+#endif // wxLongLong_t
+
+
+#if wxHAS_INT64
+void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+ DoReadLL(buffer, size, m_input, m_be_order);
+#else
+ DoReadI64(buffer, size, m_input, m_be_order);
+#endif
+}
+
+void wxDataInputStream::Read64(wxInt64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+ DoReadLL(buffer, size, m_input, m_be_order);
+#else
+ DoReadI64(buffer, size, m_input, m_be_order);
+#endif
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+void wxDataInputStream::Read64(wxULongLong *buffer, size_t size)
+{
+ DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+void wxDataInputStream::Read64(wxLongLong *buffer, size_t size)
+{
+ DoReadLL(buffer, size, m_input, m_be_order);
+}
+#endif // wxLongLong_t
+
+#if wxUSE_LONGLONG
+void wxDataInputStream::ReadLL(wxULongLong *buffer, size_t size)
+{
+ DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+void wxDataInputStream::ReadLL(wxLongLong *buffer, size_t size)
+{
+ DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+wxLongLong wxDataInputStream::ReadLL(void)
+{
+ wxLongLong ll;
+ DoReadLL(&ll, (size_t)1, m_input, m_be_order);
+ return ll;
+}
+#endif // wxUSE_LONGLONG
+
void wxDataInputStream::Read32(wxUint32 *buffer, size_t size)
{
- m_input->Read(buffer, size * 4);
+ m_input->Read(buffer, size * 4);
- if (m_be_order)
- {
- for (wxUint32 i=0; i<size; i++)
+ if (m_be_order)
{
- wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
- *(buffer++) = v;
+ for (wxUint32 i=0; i<size; i++)
+ {
+ wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
+ *(buffer++) = v;
+ }
}
- }
-else
- {
- for (wxUint32 i=0; i<size; i++)
+ else
{
- wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
- *(buffer++) = v;
+ for (wxUint32 i=0; i<size; i++)
+ {
+ wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
+ *(buffer++) = v;
+ }
}
- }
}
void wxDataInputStream::Read16(wxUint16 *buffer, size_t size)
}
}
+void wxDataInputStream::ReadFloat(float *buffer, size_t size)
+{
+ for (wxUint32 i=0; i<size; i++)
+ {
+ *(buffer++) = ReadFloat();
+ }
+}
+
wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
{
s = ReadString();
return *this;
}
+#if wxHAS_INT64
wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
{
i = Read64();
return *this;
}
-wxDataInputStream& wxDataInputStream::operator>>(double& i)
+wxDataInputStream& wxDataInputStream::operator>>(wxInt64& i)
{
- i = ReadDouble();
+ i = Read64();
+ return *this;
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+wxDataInputStream& wxDataInputStream::operator>>(wxULongLong& i)
+{
+ i = ReadLL();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i)
+{
+ i = ReadLL();
+ return *this;
+}
+#endif // wxLongLong_t
+
+wxDataInputStream& wxDataInputStream::operator>>(double& d)
+{
+ d = ReadDouble();
return *this;
}
wxDataInputStream& wxDataInputStream::operator>>(float& f)
{
- f = (float)ReadDouble();
+ f = ReadFloat();
return *this;
}
// 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
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv)
+ : wxDataStreamBase(conv),
+ m_output(&s)
{
}
-wxDataOutputStream::~wxDataOutputStream()
+#if wxHAS_INT64
+void wxDataOutputStream::Write64(wxUint64 i)
{
+ Write64(&i, 1);
}
-void wxDataOutputStream::Write64(wxUint64 i)
+void wxDataOutputStream::Write64(wxInt64 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);
+ Write64(&i, 1);
}
+#endif // wxHAS_INT64
void wxDataOutputStream::Write32(wxUint32 i)
{
void wxDataOutputStream::WriteString(const wxString& string)
{
#if wxUSE_UNICODE
- const wxWX2MBbuf buf = string.mb_str(m_conv);
+ const wxWX2MBbuf buf = string.mb_str(*m_conv);
#else
const wxWX2MBbuf buf = string.mb_str();
#endif
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);
-#else
-#ifndef __VMS__
-# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
-#endif
- buf[0] = '\0';
-#endif
- m_output->Write(buf, 10);
+ if ( m_useExtendedPrecision )
+ {
+ char buf[10];
+
+ wxConvertToIeeeExtended(d, (wxInt8 *)buf);
+ m_output->Write(buf, 10);
+ }
+ else
+#endif // wxUSE_APPLE_IEEE
+ {
+ Float64Data floatData;
+
+ floatData.f = (wxFloat64)d;
+
+ if ( m_be_order == (wxBYTE_ORDER == wxBIG_ENDIAN) )
+ {
+ Write32(floatData.i[0]);
+ Write32(floatData.i[1]);
+ }
+ else
+ {
+ Write32(floatData.i[1]);
+ Write32(floatData.i[0]);
+ }
+ }
}
-void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size)
+void wxDataOutputStream::WriteFloat(float f)
{
- if (m_be_order)
- {
- for (wxUint32 i=0; i<size ;i++)
+#if wxUSE_APPLE_IEEE
+ if ( m_useExtendedPrecision )
{
- wxUint64 i64 = wxUINT64_SWAP_ON_LE(*buffer);
- buffer++;
- m_output->Write(&i64, 8);
+ WriteDouble((double)f);
}
- }
- else
- {
- for (wxUint32 i=0; i<size ;i++)
+ else
+#endif // wxUSE_APPLE_IEEE
{
- wxUint64 i64 = wxUINT64_SWAP_ON_BE(*buffer);
- buffer++;
- m_output->Write(&i64, 8);
+ Float32Data floatData;
+
+ floatData.f = (wxFloat32)f;
+ Write32(floatData.i);
}
- }
}
+#if wxHAS_INT64
+void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+ DoWriteLL(buffer, size, m_output, m_be_order);
+#else
+ DoWriteI64(buffer, size, m_output, m_be_order);
+#endif
+}
+
+void wxDataOutputStream::Write64(const wxInt64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+ DoWriteLL(buffer, size, m_output, m_be_order);
+#else
+ DoWriteI64(buffer, size, m_output, m_be_order);
+#endif
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+void wxDataOutputStream::Write64(const wxULongLong *buffer, size_t size)
+{
+ DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::Write64(const wxLongLong *buffer, size_t size)
+{
+ DoWriteLL(buffer, size, m_output, m_be_order);
+}
+#endif // wxLongLong_t
+
+#if wxUSE_LONGLONG
+void wxDataOutputStream::WriteLL(const wxULongLong *buffer, size_t size)
+{
+ DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::WriteLL(const wxLongLong *buffer, size_t size)
+{
+ DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::WriteLL(const wxLongLong &ll)
+{
+ WriteLL(&ll, 1);
+}
+
+void wxDataOutputStream::WriteLL(const wxULongLong &ll)
+{
+ WriteLL(&ll, 1);
+}
+#endif // wxUSE_LONGLONG
+
void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size)
{
if (m_be_order)
}
}
-wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+void wxDataOutputStream::WriteFloat(const float *buffer, size_t size)
{
- Write32(wxStrlen(string));
- m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
- return *this;
+ for (wxUint32 i=0; i<size; i++)
+ {
+ WriteFloat(*(buffer++));
+ }
}
wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
return *this;
}
+#if wxHAS_INT64
wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
{
Write64(i);
return *this;
}
-wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt64 i)
{
- WriteDouble(f);
+ Write64(i);
+ return *this;
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxULongLong &i)
+{
+ WriteLL(i);
+ return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxLongLong &i)
+{
+ WriteLL(i);
+ return *this;
+}
+#endif // wxLongLong_t
+
+wxDataOutputStream& wxDataOutputStream::operator<<(double d)
+{
+ WriteDouble(d);
return *this;
}
wxDataOutputStream& wxDataOutputStream::operator<<(float f)
{
- WriteDouble((double)f);
+ WriteFloat(f);
return *this;
}
#endif
// wxUSE_STREAMS
-
projects / wxWidgets.git / blobdiff