Merge branch 'dev' into adapt

This commit is contained in:
Yann Collet 2018-08-09 15:57:36 -07:00
commit 3d7b533f68

View File

@ -802,7 +802,7 @@ FIO_compressZstdFrame(const cRess_t* ressPtr,
(U32)(zfp.produced >> 20), (U32)(zfp.produced >> 20),
cShare ); cShare );
} else { } else {
assert(g_displayLevel == 2); /* g_displayLevel <= 2; only display notifications if == 2; */
DISPLAYLEVEL(2, "\rRead : %u ", (U32)(zfp.consumed >> 20)); DISPLAYLEVEL(2, "\rRead : %u ", (U32)(zfp.consumed >> 20));
if (fileSize != UTIL_FILESIZE_UNKNOWN) if (fileSize != UTIL_FILESIZE_UNKNOWN)
DISPLAYLEVEL(2, "/ %u ", (U32)(fileSize >> 20)); DISPLAYLEVEL(2, "/ %u ", (U32)(fileSize >> 20));