From: W. Felix Handte Date: Fri, 27 Apr 2018 18:10:27 +0000 (-0400) Subject: Avoid Possibly Redundant Table Clears When Loading HC Dict X-Git-Tag: upstream/1.9.3~8^2~17^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fefc40fc0afe8c1f5a02e65b94bb65515fd949c4;p=platform%2Fupstream%2Flz4.git Avoid Possibly Redundant Table Clears When Loading HC Dict --- diff --git a/lib/lz4frame.c b/lib/lz4frame.c index c4e0ae0..8cf0c2f 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -472,7 +472,7 @@ LZ4F_CDict* LZ4F_createCDict(const void* dictBuffer, size_t dictSize) } memcpy(cdict->dictContent, dictStart, dictSize); LZ4_loadDict (cdict->fastCtx, (const char*)cdict->dictContent, (int)dictSize); - LZ4_resetStreamHC(cdict->HCCtx, LZ4HC_CLEVEL_DEFAULT); + LZ4_setCompressionLevel(cdict->HCCtx, LZ4HC_CLEVEL_DEFAULT); LZ4_loadDictHC(cdict->HCCtx, (const char*)cdict->dictContent, (int)dictSize); return cdict; } diff --git a/lib/lz4hc.c b/lib/lz4hc.c index 4126ef8..90f52f0 100644 --- a/lib/lz4hc.c +++ b/lib/lz4hc.c @@ -877,8 +877,8 @@ int LZ4_loadDictHC (LZ4_streamHC_t* LZ4_streamHCPtr, const char* dictionary, int dictionary += dictSize - 64 KB; dictSize = 64 KB; } + LZ4_resetStreamHC(LZ4_streamHCPtr, ctxPtr->compressionLevel); LZ4HC_init (ctxPtr, (const BYTE*)dictionary); - LZ4HC_clearTables (ctxPtr); ctxPtr->end = (const BYTE*)dictionary + dictSize; if (dictSize >= 4) LZ4HC_Insert (ctxPtr, ctxPtr->end-3); return dictSize;