From 5c010c9d2d9c78622fff02c539159c94d185347b Mon Sep 17 00:00:00 2001 From: Sen Huang Date: Tue, 15 Oct 2019 13:10:05 -0400 Subject: [PATCH] merge conflicts round 2 --- lib/compress/zstd_compress.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index c6ab40ecd..adf0ccab7 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -2917,7 +2917,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx, { size_t const dictID = cdict ? ZSTD_compress_insertDictionary( cctx->blockState.prevCBlock, &cctx->blockState.matchState, - ¶ms, cdict->dictContent, cdict->dictContentSize, + &cctx->workspace, params, cdict->dictContent, cdict->dictContentSize, dictContentType, dtlm, cctx->entropyWorkspace) : ZSTD_compress_insertDictionary( cctx->blockState.prevCBlock, &cctx->blockState.matchState, @@ -3237,13 +3237,8 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, assert(cdict != NULL); ZSTD_cwksp_move(&cdict->workspace, &ws); cdict->customMem = customMem; -<<<<<<< HEAD - cdict->workspace = workspace; - cdict->workspaceSize = workspaceSize; cdict->compressionLevel = 0; /* signals advanced API usage */ -======= ->>>>>>> 8b6d96827c24dd09109830272f413254833317d9 if (ZSTD_isError( ZSTD_initCDict_internal(cdict, dictBuffer, dictSize, dictLoadMethod, dictContentType,