diff options
| author | Yann Collet <cyan@fb.com> | 2017-12-22 11:47:59 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2017-12-22 11:47:59 (GMT) |
| commit | 7d2f30c7d1519a3a4a199e398e13d9baa21bf84e (patch) | |
| tree | 68e816073fbde339262fdee0ebcb35222357ab07 /lib/lz4hc.c | |
| parent | fdde4311fb47332d81f2fa84a06e5605e6b68600 (diff) | |
| download | lz4-7d2f30c7d1519a3a4a199e398e13d9baa21bf84e.zip lz4-7d2f30c7d1519a3a4a199e398e13d9baa21bf84e.tar.gz lz4-7d2f30c7d1519a3a4a199e398e13d9baa21bf84e.tar.bz2 | |
lz4opt supports _destSize
no longer limited to level 9
Diffstat (limited to 'lib/lz4hc.c')
| -rw-r--r-- | lib/lz4hc.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/lz4hc.c b/lib/lz4hc.c index 388eb40..e6d496c 100644 --- a/lib/lz4hc.c +++ b/lib/lz4hc.c @@ -425,10 +425,7 @@ static int LZ4HC_compress_hashChain ( /* init */ *srcSizePtr = 0; - if (limit == limitedDestSize && maxOutputSize < 1) return 0; /* Impossible to store anything */ - if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0; /* Unsupported input size, too large (or negative) */ - - if (limit == limitedDestSize) oend -= LASTLITERALS; /* Hack for support limitations LZ4 decompressor */ + if (limit == limitedDestSize) oend -= LASTLITERALS; /* Hack for support LZ4 format restriction */ if (inputSize < LZ4_minLength) goto _last_literals; /* Input too small, no compression (all literals) */ /* Main Loop */ @@ -641,11 +638,12 @@ static int LZ4HC_compress_generic ( { lz4opt,8192, LZ4_OPT_NUM }, /* 12==LZ4HC_CLEVEL_MAX */ }; + if (limit == limitedDestSize && dstCapacity < 1) return 0; /* Impossible to store anything */ + if ((U32)*srcSizePtr > (U32)LZ4_MAX_INPUT_SIZE) return 0; /* Unsupported input size (too large or negative) */ + ctx->end += *srcSizePtr; if (cLevel < 1) cLevel = LZ4HC_CLEVEL_DEFAULT; /* note : convention is different from lz4frame, maybe something to review */ cLevel = MIN(LZ4HC_CLEVEL_MAX, cLevel); - if (limit == limitedDestSize) - cLevel = MIN(LZ4HC_CLEVEL_OPT_MIN-1, cLevel); /* no limitedDestSize variant for lz4opt */ assert(cLevel >= 0); assert(cLevel <= LZ4HC_CLEVEL_MAX); { cParams_t const cParam = clTable[cLevel]; @@ -655,8 +653,8 @@ static int LZ4HC_compress_generic ( cParam.nbSearches, limit); assert(cParam.strat == lz4opt); return LZ4HC_compress_optimal(ctx, - src, dst, *srcSizePtr, dstCapacity, limit, - cParam.nbSearches, cParam.targetLength, + src, dst, srcSizePtr, dstCapacity, + cParam.nbSearches, cParam.targetLength, limit, cLevel == LZ4HC_CLEVEL_MAX); /* ultra mode */ } } |