diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-24 14:27:53 +0200 |
| commit | 3e5c51e1f7b99eda252e06968520d212eb5f5fe4 (patch) | |
| tree | a04e2034316e024f0648a657369772c7f46bb0a8 /src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp | |
| parent | f9814b28ce934541f16d12d54534bea543143c01 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."wip/componentview
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp')
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp index 7c641d7f7..cb1f981a7 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp +++ b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.cpp @@ -291,7 +291,7 @@ static UInt32 NO_INLINE DecodeBlock2(const UInt32 *tt, UInt32 blockSize, UInt32 unsigned b = (unsigned)(tPos & 0xFF); tPos = tt[tPos >> 8]; - if (numReps == (unsigned int)kRleModeRepSize) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (numReps == kRleModeRepSize) { for (; b > 0; b--) { @@ -395,7 +395,7 @@ static UInt32 NO_INLINE DecodeBlock2Rand(const UInt32 *tt, UInt32 blockSize, UIn randToGo--; } - if (numReps == (unsigned int)kRleModeRepSize) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (numReps == kRleModeRepSize) { for (; b > 0; b--) { @@ -904,7 +904,7 @@ STDMETHODIMP CNsisDecoder::Read(void *data, UInt32 size, UInt32 *processedSize) tPos = tt[tPos >> 8]; blockSize--; - if (numReps == (unsigned int)kRleModeRepSize) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (numReps == kRleModeRepSize) { numReps = 0; while (b) |