dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed unused variables and fixed GCC warnings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-09-08 02:50:09 +00:00
parent c6fdb4436d
commit 2d99d7ad3e
26 changed files with 124 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
View file

@ -1220,8 +1220,8 @@ HRESULT CEncoder::GetOptimumFast(UInt32 position, UInt32 &backRes, UInt32 &lenRe
if (repLens[repMaxIndex] >= 2)
{
if (repLens[repMaxIndex] + 1 >= lenMain ||
repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9)) ||
repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15)))
(repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9))) ||
(repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15))) )
{
backRes = repMaxIndex;
lenRes = repLens[repMaxIndex];
@ -1235,10 +1235,10 @@ HRESULT CEncoder::GetOptimumFast(UInt32 position, UInt32 &backRes, UInt32 &lenRe
if (_longestMatchLength >= 2)
{
UInt32 newDistance = matchDistances[_numDistancePairs - 1];
if (_longestMatchLength >= lenMain && newDistance < backMain ||
_longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance) ||
_longestMatchLength > lenMain + 1 ||
_longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain))
if ((_longestMatchLength >= lenMain && newDistance < backMain) ||
(_longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance)) ||
(_longestMatchLength > lenMain + 1) ||
(_longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain)))
{
_longestMatchWasFound = true;
backRes = UInt32(-1);