]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
changed to using ZSTD_compressBegin_usingDict() and fixed strange issue with ZSTD_com...
authorPaul Cruz <paulcruz74@fb.com>
Tue, 11 Jul 2017 18:50:00 +0000 (11:50 -0700)
committerPaul Cruz <paulcruz74@fb.com>
Tue, 11 Jul 2017 18:50:00 +0000 (11:50 -0700)
contrib/adaptive-compression/adapt.c

index e03bcc8e1ced2c9a69d079cbdb9fd49c57c59a56..9a527ff5e8a706c3c80de6c109fee19fbab9cb3f 100644 (file)
@@ -252,13 +252,12 @@ static void* compressionThread(void* arg)
         /* compress the data */
         {
             unsigned const cLevel = adaptCompressionLevel(ctx);
-            ZSTD_parameters params = ZSTD_getParams(cLevel, job->src.size, 0);
             DEBUG(2, "cLevel used: %u\n", cLevel);
 
             /* begin compression */
             {
                 size_t const dictModeError = ZSTD_setCCtxParameter(ctx->cctx, ZSTD_p_forceRawDict, 1);
-                size_t const initError = ZSTD_compressBegin_advanced(ctx->cctx, job->dict.start, job->dict.size, params, 0);
+                size_t const initError = ZSTD_compressBegin_usingDict(ctx->cctx, job->dict.start, job->dict.size, cLevel);
                 size_t const windowSizeError = ZSTD_setCCtxParameter(ctx->cctx, ZSTD_p_forceWindow, 1);
                 if (ZSTD_isError(dictModeError) || ZSTD_isError(initError) || ZSTD_isError(windowSizeError)) {
                     DISPLAY("Error: something went wrong while starting compression\n");
@@ -269,7 +268,7 @@ static void* compressionThread(void* arg)
 
             /* continue compression */
             if (currJob != 0) { /* not first job */
-                size_t const hSize = ZSTD_compressContinue(ctx->cctx, job->dst.start, job->dst.size, job->src.start, 0);
+                size_t const hSize = ZSTD_compressContinue(ctx->cctx, job->dst.start, job->dst.size, job->src.start, job->src.size);
                 if (ZSTD_isError(hSize)) {
                     job->compressedSize = hSize;
                     ctx->threadError = 1;