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

Fix ZIP64 code compilation under 64 bit Unix platforms.

Browse Source 
Calling wxDataOutputStream::Write64() with a wxFileOffset argument is
ambiguous as wxFileOffset is neither wxInt64 nor wxUint64, so cast it to one
of them (it doesn't matter which) explicitly.
This commit is contained in:
Vadim Zeitlin
2015-08-14 17:15:40 +02:00
parent b9d46f0719
commit e691cfe83d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/zipstrm.cpp
View File

@@ -1118,8 +1118,8 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
{ {
ds.Write16(1); // id ds.Write16(1); // id
ds.Write16(16); // record size ds.Write16(16); // record size
ds.Write64(m_CompressedSize); ds.Write64(static_cast<wxInt64>(m_CompressedSize));
ds.Write64(m_Size); ds.Write64(static_cast<wxInt64>(m_Size));
} }
if (GetLocalExtraLen()) if (GetLocalExtraLen())
stream.Write(m_LocalExtra->GetData(), GetLocalExtraLen()); stream.Write(m_LocalExtra->GetData(), GetLocalExtraLen());
@@ -1244,11 +1244,11 @@ size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
ds.Write16(1); // tag ds.Write16(1); // tag
ds.Write16(z64InfoLen); // record size ds.Write16(z64InfoLen); // record size
if (m_CompressedSize > 0xffffffff) if (m_CompressedSize > 0xffffffff)
ds.Write64(m_CompressedSize); ds.Write64(static_cast<wxInt64>(m_CompressedSize));
if (m_Size > 0xffffffff) if (m_Size > 0xffffffff)
ds.Write64(m_Size); ds.Write64(static_cast<wxInt64>(m_Size));
if (m_Offset > 0xffffffff) if (m_Offset > 0xffffffff)
ds.Write64(m_Offset); ds.Write64(static_cast<wxInt64>(m_Offset));
} }
if (GetExtraLen()) if (GetExtraLen())
stream.Write(GetExtra(), GetExtraLen()); stream.Write(GetExtra(), GetExtraLen());
@@ -1403,7 +1403,7 @@ bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
// Write zip64 end of central directory locator // Write zip64 end of central directory locator
ds.Write32(Z64_LOC_MAGIC); ds.Write32(Z64_LOC_MAGIC);
ds.Write32(m_StartDisk); ds.Write32(m_StartDisk);
ds.Write64(z64endOffset); ds.Write64(static_cast<wxInt64>(z64endOffset));
ds.Write32(1); // total number of disks ds.Write32(1); // total number of disks
} }