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

Another work around for VC8 compiler bug after ZIP64 changes

Browse Source 
Apply the same fix as in ba851346b5 in another
place where the same bug occurs.
This commit is contained in:
Vadim Zeitlin
2015-09-09 03:39:17 +02:00
parent 5905857dba
commit 7f08dbbf78
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/zipstrm.cpp
View File

@@ -1152,8 +1152,10 @@ size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
>> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes; >> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes;
SetOffset(ds.Read32()); SetOffset(ds.Read32());
wxMBConv& strConv = // Another MSVS 2005 workaround, see above (FIXME-VC8).
((m_Flags & wxZIP_LANG_ENC_UTF8) == 0) ? conv : wxConvUTF8; wxMBConv& strConv = m_Flags & wxZIP_LANG_ENC_UTF8
? static_cast<wxMBConv&>(wxConvUTF8)
: conv;
SetName(ReadString(stream, nameLen, strConv), wxPATH_UNIX); SetName(ReadString(stream, nameLen, strConv), wxPATH_UNIX);
if (stream.LastRead() != nameLen + 0u) if (stream.LastRead() != nameLen + 0u)
return 0; return 0;