Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for 64 bit ints in wx stream classes (patch 1203970)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-11 16:51:34 +00:00
parent 87152bb53d
commit 216a72f3b9
10 changed files with 883 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

332
src/common/datstrm.cpp
View File

@@ -35,17 +35,14 @@ wxDataInputStream::wxDataInputStream(wxInputStream& s)
{
}
#if wxHAS_INT64
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);
wxUint64 tmp;
Read64(&tmp, 1);
return tmp;
}
#endif // wxHAS_INT64
wxUint32 wxDataInputStream::Read32()
{
@@ -114,28 +111,196 @@ wxString wxDataInputStream::ReadString()
return wxEmptyString;
}
void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
{
m_input->Read(buffer, size * 8);
#if wxUSE_LONGLONG
if (m_be_order)
{
for (wxUint32 i=0; i<size; i++)
template <class T>
static
void DoReadLL(T *buffer, size_t size, wxInputStream *input, bool be_order)
{
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 )
{
wxUint64 v = wxUINT64_SWAP_ON_LE(*buffer);
*(buffer++) = v;
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;
}
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 ( size_t i = 0; i < size; i++ )
{
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, 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);
@@ -235,12 +400,34 @@ wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
return *this;
}
#if wxHAS_INT64
wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
{
i = Read64();
return *this;
}
wxDataInputStream& wxDataInputStream::operator>>(wxInt64& i)
{
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& i)
{
i = ReadDouble();
@@ -267,17 +454,18 @@ wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
{
}
#if wxHAS_INT64
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);
Write64(&i, 1);
}
void wxDataOutputStream::Write64(wxInt64 i)
{
Write64(&i, 1);
}
#endif // wxHAS_INT64
void wxDataOutputStream::Write32(wxUint32 i)
{
wxUint32 i32;
@@ -334,28 +522,60 @@ void wxDataOutputStream::WriteDouble(double d)
m_output->Write(buf, 10);
}
#if wxHAS_INT64
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);
}
}
#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)
@@ -462,12 +682,34 @@ wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
return *this;
}
#if wxHAS_INT64
wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
{
Write64(i);
return *this;
}
wxDataOutputStream& wxDataOutputStream::operator<<(wxInt64 i)
{
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 f)
{
WriteDouble(f);