mirror of
https://github.com/facebook/zstd.git
synced 2025-11-27 11:41:11 +03:00
Merge branch 'dev' into compressBound
This commit is contained in:
@@ -184,7 +184,7 @@ FSE_PUBLIC_API size_t FSE_writeNCount (void* buffer, size_t bufferSize, const sh
|
|||||||
/*! Constructor and Destructor of FSE_CTable.
|
/*! Constructor and Destructor of FSE_CTable.
|
||||||
Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
|
Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
|
||||||
typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */
|
typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */
|
||||||
FSE_PUBLIC_API FSE_CTable* FSE_createCTable (unsigned tableLog, unsigned maxSymbolValue);
|
FSE_PUBLIC_API FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog);
|
||||||
FSE_PUBLIC_API void FSE_freeCTable (FSE_CTable* ct);
|
FSE_PUBLIC_API void FSE_freeCTable (FSE_CTable* ct);
|
||||||
|
|
||||||
/*! FSE_buildCTable():
|
/*! FSE_buildCTable():
|
||||||
|
|||||||
@@ -649,8 +649,8 @@ ZSTD_compressionParameters ZSTD_adjustCParams_internal(ZSTD_compressionParameter
|
|||||||
|
|
||||||
if (dictSize && (srcSize+1<2) /* srcSize unknown */ )
|
if (dictSize && (srcSize+1<2) /* srcSize unknown */ )
|
||||||
srcSize = minSrcSize; /* presumed small when there is a dictionary */
|
srcSize = minSrcSize; /* presumed small when there is a dictionary */
|
||||||
else
|
else if (srcSize == 0)
|
||||||
srcSize -= 1; /* unknown 0 => -1ULL : presumed large */
|
srcSize = ZSTD_CONTENTSIZE_UNKNOWN; /* 0 == unknown : presumed large */
|
||||||
|
|
||||||
/* resize windowLog if input is small enough, to use less memory */
|
/* resize windowLog if input is small enough, to use less memory */
|
||||||
if ( (srcSize < maxWindowResize)
|
if ( (srcSize < maxWindowResize)
|
||||||
|
|||||||
Reference in New Issue
Block a user