From: Yann Collet <cyan@fb.com>
Date: Thu, 7 Jun 2018 22:51:35 +0000 (-0700)
Subject: Merge branch 'dev' into negLevels
X-Git-Tag: v1.3.5~3^2~27^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30507330427efb010d293c4ac4e51ae55d6b8b73;p=thirdparty%2Fzstd.git

Merge branch 'dev' into negLevels
---

30507330427efb010d293c4ac4e51ae55d6b8b73
diff --cc lib/compress/zstd_compress.c
index 2c566dd39,e0c29ac44..26bb54229
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -708,7 -707,9 +709,7 @@@ ZSTD_clampCParams(ZSTD_compressionParam
      CLAMP(cParams.hashLog, ZSTD_HASHLOG_MIN, ZSTD_HASHLOG_MAX);
      CLAMP(cParams.searchLog, ZSTD_SEARCHLOG_MIN, ZSTD_SEARCHLOG_MAX);
      CLAMP(cParams.searchLength, ZSTD_SEARCHLENGTH_MIN, ZSTD_SEARCHLENGTH_MAX);
-     if ((U32)(cParams.strategy) > (U32)ZSTD_btultra) cParams.strategy = ZSTD_btultra;
 -    if ((U32)(cParams.targetLength) < ZSTD_TARGETLENGTH_MIN)
 -        cParams.targetLength = ZSTD_TARGETLENGTH_MIN;
+     CLAMP(cParams.strategy, ZSTD_fast, ZSTD_btultra);
      return cParams;
  }