facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflicts round 2

Browse Source
This commit is contained in:
Sen Huang 2019-10-15 13:10:05 -04:00
parent 053a35fd64
commit a727a85a7e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/compress/zstd_compress.c
View File

@ -2917,7 +2917,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
{ size_t const dictID = cdict ? { size_t const dictID = cdict ?
ZSTD_compress_insertDictionary( ZSTD_compress_insertDictionary(
cctx->blockState.prevCBlock, &cctx->blockState.matchState, cctx->blockState.prevCBlock, &cctx->blockState.matchState,
params, cdict->dictContent, cdict->dictContentSize, &cctx->workspace, params, cdict->dictContent, cdict->dictContentSize,
dictContentType, dtlm, cctx->entropyWorkspace) dictContentType, dtlm, cctx->entropyWorkspace)
: ZSTD_compress_insertDictionary( : ZSTD_compress_insertDictionary(
cctx->blockState.prevCBlock, &cctx->blockState.matchState, cctx->blockState.prevCBlock, &cctx->blockState.matchState,
@ -3237,12 +3237,17 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize,
ZSTD_cwksp_move(&cdict->workspace, &ws); ZSTD_cwksp_move(&cdict->workspace, &ws);
cdict->customMem = customMem; cdict->customMem = customMem;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
cdict->workspace = workspace; cdict->workspace = workspace;
cdict->workspaceSize = workspaceSize; cdict->workspaceSize = workspaceSize;
cdict->compressionLevel = 0; /* signals advanced API usage */ cdict->compressionLevel = 0; /* signals advanced API usage */
>>>>>>> Fix error >>>>>>> Fix error
=======
cdict->compressionLevel = 0; /* signals advanced API usage */
>>>>>>> merge conflicts round 2
if (ZSTD_isError( ZSTD_initCDict_internal(cdict, if (ZSTD_isError( ZSTD_initCDict_internal(cdict,
dictBuffer, dictSize, dictBuffer, dictSize,
dictLoadMethod, dictContentType, dictLoadMethod, dictContentType,