AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed one macro usage

Browse Source
This commit is contained in:
Yann Collet 2017-10-20 13:32:45 -07:00
parent ee62faee08
commit fa064c8a8c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/lz4opt.h
View File

@ -284,7 +284,8 @@ static int LZ4HC_compress_optimal (
size_t nb_matches; size_t nb_matches;
/* establish baseline price if cur is literal */ /* establish baseline price if cur is literal */
{ size_t price, litlen; { size_t price;
int litlen;
if (opt[cur-1].mlen == 1) { if (opt[cur-1].mlen == 1) {
/* no match at previous position */ /* no match at previous position */
litlen = opt[cur-1].litlen + 1; litlen = opt[cur-1].litlen + 1;
@ -293,13 +294,19 @@ static int LZ4HC_compress_optimal (
litlen = 1; litlen = 1;
price = opt[cur - 1].price + LZ4HC_literalsPrice(1); price = opt[cur - 1].price + LZ4HC_literalsPrice(1);
} }
if (price < (size_t)opt[cur].price) {
if (price < (size_t)opt[cur].price) opt[cur].mlen = 1;
SET_PRICE(cur, 1 /*mlen*/, 0 /*off*/, litlen, price); /* note : increases last_match_pos */ opt[cur].off = 0;
opt[cur].litlen = litlen;
opt[cur].price = (int)price;
}
} }
if (cur == last_match_pos || curPtr >= mflimit) break; if (cur == last_match_pos || curPtr >= mflimit) break;
//assert(cur+2 <= last_match_pos);
//assert(cur+3 <= last_match_pos);
nb_matches = LZ4HC_BinTree_GetAllMatches(ctx, curPtr, matchlimit, MINMATCH-1, matches, fullUpdate); nb_matches = LZ4HC_BinTree_GetAllMatches(ctx, curPtr, matchlimit, MINMATCH-1, matches, fullUpdate);
if ((nb_matches > 0) && (size_t)matches[nb_matches-1].len > sufficient_len) { if ((nb_matches > 0) && (size_t)matches[nb_matches-1].len > sufficient_len) {
/* immediate encoding */ /* immediate encoding */