From: Yann Collet <cyan@fb.com>
Date: Wed, 21 Mar 2018 13:08:28 +0000 (-0700)
Subject: Merge branch 'dev' into advancedDecompress
X-Git-Tag: v1.3.4~1^2~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a99c4a3621766b978083af15514c42f5ae3b2964;p=thirdparty%2Fzstd.git

Merge branch 'dev' into advancedDecompress
---

a99c4a3621766b978083af15514c42f5ae3b2964
diff --cc lib/compress/zstd_compress.c
index 85678a8dc,06ec4609f..528291777
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -547,10 -516,10 +516,10 @@@ size_t ZSTD_CCtx_loadDictionary_advance
          cctx->cdict = NULL;
      } else {
          ZSTD_compressionParameters const cParams =
-                 ZSTD_getCParamsFromCCtxParams(cctx->requestedParams, cctx->pledgedSrcSizePlusOne-1, dictSize);
+                 ZSTD_getCParamsFromCCtxParams(&cctx->requestedParams, cctx->pledgedSrcSizePlusOne-1, dictSize);
          cctx->cdictLocal = ZSTD_createCDict_advanced(
                                  dict, dictSize,
 -                                dictLoadMethod, dictMode,
 +                                dictLoadMethod, dictContentType,
                                  cParams, cctx->customMem);
          cctx->cdict = cctx->cdictLocal;
          if (cctx->cdictLocal == NULL)
@@@ -2538,10 -2616,11 +2616,11 @@@ static size_t ZSTD_initCDict_internal
                      ZSTD_CDict* cdict,
                const void* dictBuffer, size_t dictSize,
                      ZSTD_dictLoadMethod_e dictLoadMethod,
 -                    ZSTD_dictMode_e dictMode,
 +                    ZSTD_dictContentType_e dictContentType,
                      ZSTD_compressionParameters cParams)
  {
-     DEBUGLOG(3, "ZSTD_initCDict_internal, mode %u", (U32)dictContentType);
 -    DEBUGLOG(3, "ZSTD_initCDict_internal, mode %u", (U32)dictMode);
++    DEBUGLOG(3, "ZSTD_initCDict_internal, dictContentType %u", (U32)dictContentType);
+     assert(!ZSTD_checkCParams(cParams));
      cdict->cParams = cParams;
      if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dictBuffer) || (!dictSize)) {
          cdict->dictBuffer = NULL;
@@@ -2574,11 -2651,10 +2651,10 @@@
          params.compressionLevel = ZSTD_CLEVEL_DEFAULT;
          params.fParams.contentSizeFlag = 1;
          params.cParams = cParams;
-         {
-             size_t const dictID = ZSTD_compress_insertDictionary(
-                     &cdict->cBlockState, &cdict->matchState,&params,
+         {   size_t const dictID = ZSTD_compress_insertDictionary(
+                     &cdict->cBlockState, &cdict->matchState, &params,
                      cdict->dictContent, cdict->dictContentSize,
 -                    dictMode, cdict->workspace);
 +                    dictContentType, cdict->workspace);
              if (ZSTD_isError(dictID)) return dictID;
              assert(dictID <= (size_t)(U32)-1);
              cdict->dictID = (U32)dictID;
@@@ -2836,8 -2912,8 +2912,8 @@@ size_t ZSTD_resetCStream(ZSTD_CStream* 
      DEBUGLOG(4, "ZSTD_resetCStream: pledgedSrcSize = %u", (U32)pledgedSrcSize);
      if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN;
      params.fParams.contentSizeFlag = 1;
-     params.cParams = ZSTD_getCParamsFromCCtxParams(params, pledgedSrcSize, 0);
+     params.cParams = ZSTD_getCParamsFromCCtxParams(&params, pledgedSrcSize, 0);
 -    return ZSTD_resetCStream_internal(zcs, NULL, 0, ZSTD_dm_auto, zcs->cdict, params, pledgedSrcSize);
 +    return ZSTD_resetCStream_internal(zcs, NULL, 0, ZSTD_dct_auto, zcs->cdict, params, pledgedSrcSize);
  }
  
  /*! ZSTD_initCStream_internal() :
@@@ -2873,10 -2949,7 +2949,7 @@@ size_t ZSTD_initCStream_internal(ZSTD_C
          zcs->cdict = cdict;
      }
  
-     params.compressionLevel = ZSTD_CLEVEL_CUSTOM; /* enforce usage of cParams, instead of a dynamic derivation from cLevel (but does that happen ?) */
-     zcs->requestedParams = params;
- 
 -    return ZSTD_resetCStream_internal(zcs, NULL, 0, ZSTD_dm_auto, zcs->cdict, params, pledgedSrcSize);
 +    return ZSTD_resetCStream_internal(zcs, NULL, 0, ZSTD_dct_auto, zcs->cdict, params, pledgedSrcSize);
  }
  
  /* ZSTD_initCStream_usingCDict_advanced() :
diff --cc lib/zstd.h
index 5d1466e76,938c71216..a35091a58
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@@ -1132,8 -1125,18 +1127,18 @@@ ZSTDLIB_API size_t ZSTD_CCtx_refCDict(Z
   *  Note 3 : By default, the prefix is treated as raw content (ZSTD_dm_rawContent).
   *           Use ZSTD_CCtx_refPrefix_advanced() to alter dictMode. */
  ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize);
 -ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictMode_e dictMode);
 +ZSTDLIB_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType);
  
+ /*! ZSTD_CCtx_reset() :
+  *  Return a CCtx to clean state.
+  *  Useful after an error, or to interrupt an ongoing compression job and start a new one.
+  *  Any internal data not yet flushed is cancelled.
+  *  Dictionary (if any) is dropped.
+  *  All parameters are back to default values.
+  *  It's possible to modify compression parameters after a reset.
+  */
+ ZSTDLIB_API void ZSTD_CCtx_reset(ZSTD_CCtx* cctx);
+ 
  
  
  typedef enum {