From: Yann Collet Date: Mon, 4 Apr 2016 12:53:16 +0000 (+0200) Subject: fixed Visual conversion warnings X-Git-Tag: v0.6.0^2~17^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59bf963a8afd634769976c3e89affeddd170da8;p=thirdparty%2Fzstd.git fixed Visual conversion warnings --- diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c index 219b13f82..fcb6e36bc 100644 --- a/lib/zstd_compress.c +++ b/lib/zstd_compress.c @@ -182,7 +182,7 @@ void ZSTD_adjustCParams(ZSTD_compressionParameters* params, U64 srcSize, size_t /* resize params, to use less memory when necessary */ { U32 const minSrcSize = (srcSize==0) ? 500 : 0; U64 const rSize = srcSize + dictSize + minSrcSize; - if (rSize < (1<windowLog > srcLog) params->windowLog = srcLog; } } diff --git a/lib/zstd_static.h b/lib/zstd_static.h index 2f11ceeb6..333861255 100644 --- a/lib/zstd_static.h +++ b/lib/zstd_static.h @@ -57,7 +57,7 @@ extern "C" { /*-************************************* * Types ***************************************/ -#define ZSTD_WINDOWLOG_MAX (MEM_32bits() ? 25 : 27) +#define ZSTD_WINDOWLOG_MAX ((U32)(MEM_32bits() ? 25 : 27)) #define ZSTD_WINDOWLOG_MIN 18 #define ZSTD_CHAINLOG_MAX (ZSTD_WINDOWLOG_MAX+1) #define ZSTD_CHAINLOG_MIN 4