diff options
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Compress')
8 files changed, 16 insertions, 16 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) diff --git a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.h b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.h index decf41dc3..e6dec1eaa 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.h +++ b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Decoder.h @@ -91,8 +91,8 @@ private: bool ReleaseInStream; CDecoderFlusher(CDecoder *decoder, bool releaseInStream): _decoder(decoder), - NeedFlush(true), - ReleaseInStream(releaseInStream) {} // PQR for MinGW-w64: Initialization order. + ReleaseInStream(releaseInStream), + NeedFlush(true) {} ~CDecoderFlusher() { if (NeedFlush) diff --git a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp index 37e719977..eaa108558 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp +++ b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp @@ -846,7 +846,7 @@ HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs, const PROPVARIANT *p UInt32 numPasses = prop.ulVal; if (numPasses == 0) numPasses = 1; - if (numPasses > (unsigned int)kNumPassesMax) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (numPasses > kNumPassesMax) numPasses = kNumPassesMax; NumPasses = numPasses; m_OptimizeNumTables = (NumPasses > 1); @@ -857,9 +857,9 @@ HRESULT CEncoder::SetCoderProperties(const PROPID *propIDs, const PROPVARIANT *p if (prop.vt != VT_UI4) return E_INVALIDARG; UInt32 dictionary = prop.ulVal / kBlockSizeStep; - if (dictionary < (unsigned int)kBlockSizeMultMin) // PQR for MinGW-w64: Signed < Unsigned comparison. + if (dictionary < kBlockSizeMultMin) dictionary = kBlockSizeMultMin; - else if (dictionary > (unsigned int)kBlockSizeMultMax) // PQR for MinGW-w64: Signed < Unsigned comparison. + else if (dictionary > kBlockSizeMultMax) dictionary = kBlockSizeMultMax; m_BlockSizeMult = dictionary; break; diff --git a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.h b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.h index e864fb398..a863172fe 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.h +++ b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.h @@ -137,7 +137,7 @@ public: DWORD ThreadFunc(); #endif - CThreadInfo(): m_Block(0), m_BlockSorterIndex(0) {} // PQR for MinGW-w64: Initialization order. + CThreadInfo(): m_BlockSorterIndex(0), m_Block(0) {} ~CThreadInfo() { Free(); } bool Alloc(); void Free(); diff --git a/src/libs/7zip/win/CPP/7zip/Compress/CopyCoder.h b/src/libs/7zip/win/CPP/7zip/Compress/CopyCoder.h index daef658d9..c5445ccf8 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/CopyCoder.h +++ b/src/libs/7zip/win/CPP/7zip/Compress/CopyCoder.h @@ -17,7 +17,7 @@ class CCopyCoder: Byte *_buffer; public: UInt64 TotalSize; - CCopyCoder(): _buffer(0), TotalSize(0) {} // PQR for MinGW-w64: Initialization order. + CCopyCoder(): TotalSize(0), _buffer(0) {}; ~CCopyCoder(); MY_UNKNOWN_IMP1(ICompressGetInStreamProcessedSize) diff --git a/src/libs/7zip/win/CPP/7zip/Compress/DeflateConst.h b/src/libs/7zip/win/CPP/7zip/Compress/DeflateConst.h index 1e0817fa7..00e5ab8bf 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/DeflateConst.h +++ b/src/libs/7zip/win/CPP/7zip/Compress/DeflateConst.h @@ -114,7 +114,7 @@ struct CLevels void SetFixedLevels() { - unsigned int i; // PQR for MinGW-w64: Signed < Unsigned comparison. + int i; for (i = 0; i < 144; i++) litLenLevels[i] = 8; diff --git a/src/libs/7zip/win/CPP/7zip/Compress/DeflateDecoder.cpp b/src/libs/7zip/win/CPP/7zip/Compress/DeflateDecoder.cpp index 28ae304b0..2848cd812 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/DeflateDecoder.cpp +++ b/src/libs/7zip/win/CPP/7zip/Compress/DeflateDecoder.cpp @@ -12,11 +12,11 @@ static const int kLenIdFinished = -1; static const int kLenIdNeedInit = -2; CCoder::CCoder(bool deflate64Mode, bool deflateNSIS): - _deflateNSIS(deflateNSIS), _deflate64Mode(deflate64Mode), + _deflateNSIS(deflateNSIS), _keepHistory(false), _needInitInStream(true), - ZlibMode(false) {} // PQR for MinGW-w64: Initialization order. + ZlibMode(false) {} UInt32 CCoder::ReadBits(int numBits) { @@ -90,14 +90,14 @@ bool CCoder::ReadTables(void) { int numLitLenLevels = ReadBits(kNumLenCodesFieldSize) + kNumLitLenCodesMin; _numDistLevels = ReadBits(kNumDistCodesFieldSize) + kNumDistCodesMin; - unsigned int numLevelCodes = ReadBits(kNumLevelCodesFieldSize) + kNumLevelCodesMin; + int numLevelCodes = ReadBits(kNumLevelCodesFieldSize) + kNumLevelCodesMin; if (!_deflate64Mode) if (_numDistLevels > kDistTableSize32) return false; Byte levelLevels[kLevelTableSize]; - for (unsigned int i = 0; i < kLevelTableSize; i++) // PQR for MinGW-w64: Signed < Unsigned comparison. + for (int i = 0; i < kLevelTableSize; i++) { int position = kCodeLengthAlphabetOrder[i]; if(i < numLevelCodes) diff --git a/src/libs/7zip/win/CPP/7zip/Compress/DeflateEncoder.cpp b/src/libs/7zip/win/CPP/7zip/Compress/DeflateEncoder.cpp index 4ce104f91..35a81cae4 100644 --- a/src/libs/7zip/win/CPP/7zip/Compress/DeflateEncoder.cpp +++ b/src/libs/7zip/win/CPP/7zip/Compress/DeflateEncoder.cpp @@ -49,7 +49,7 @@ class CFastPosInit public: CFastPosInit() { - unsigned int i; // PQR for MinGW-w64: Signed < Unsigned comparison. + int i; for(i = 0; i < kNumLenSlots; i++) { int c = kLenStart32[i]; |