Merge branch 'dev' into progressiveMT
This commit is contained in:
commit
b6ab232f2d
@ -2566,6 +2566,8 @@ static size_t ZSTD_initCDict_internal(
|
||||
}
|
||||
cdict->dictContentSize = dictSize;
|
||||
|
||||
/* Reset the state to no dictionary */
|
||||
ZSTD_reset_compressedBlockState(&cdict->cBlockState);
|
||||
{
|
||||
void* const end = ZSTD_reset_matchState(
|
||||
&cdict->matchState,
|
||||
@ -2574,6 +2576,9 @@ static size_t ZSTD_initCDict_internal(
|
||||
assert(end == (char*)cdict->workspace + cdict->workspaceSize);
|
||||
(void)end;
|
||||
}
|
||||
/* (Maybe) load the dictionary
|
||||
* Skips loading the dictionary if it is <= 8 bytes.
|
||||
*/
|
||||
{
|
||||
ZSTD_CCtx_params params;
|
||||
memset(¶ms, 0, sizeof(params));
|
||||
|
Loading…
x
Reference in New Issue
Block a user