diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-08-08 17:31:38 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-10 13:12:47 +0200 |
| commit | 9cad5d54cf0d78e92b4ee831299d83b657f42f2e (patch) | |
| tree | e1914be8eadfd06ad64ff5dd31d200a4cf95df86 /src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp | |
| parent | 0188b08e8dc218fb66f59522ffa7c02643a9577a (diff) | |
Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp')
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp b/src/libs/7zip/win/CPP/7zip/Compress/BZip2Encoder.cpp index eaa108558..37e719977 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 > kNumPassesMax) + if (numPasses > (unsigned int)kNumPassesMax) // PQR for MinGW-w64: Signed < Unsigned comparison. 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 < kBlockSizeMultMin) + if (dictionary < (unsigned int)kBlockSizeMultMin) // PQR for MinGW-w64: Signed < Unsigned comparison. dictionary = kBlockSizeMultMin; - else if (dictionary > kBlockSizeMultMax) + else if (dictionary > (unsigned int)kBlockSizeMultMax) // PQR for MinGW-w64: Signed < Unsigned comparison. dictionary = kBlockSizeMultMax; m_BlockSizeMult = dictionary; break; |