diff --git a/lib/common/huf.h b/lib/common/huf.h index 0db6fb369..dee99da77 100644 --- a/lib/common/huf.h +++ b/lib/common/huf.h @@ -190,7 +190,7 @@ typedef enum { * For example, it's possible to compress several blocks using the same 'CTable', * or to save and regenerate 'CTable' using external methods. */ -unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality); +unsigned HUF_minTableLog(unsigned symbolCardinality); unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue); unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode); /* table is used as scratch space for building and testing tables, not a return value */ diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c index d8bbaa6b4..b6905d3a6 100644 --- a/lib/compress/huf_compress.c +++ b/lib/compress/huf_compress.c @@ -1247,19 +1247,17 @@ unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue) return cardinality; } -unsigned HUF_minTableLog(size_t srcSize, unsigned symbolCardinality) +unsigned HUF_minTableLog(unsigned symbolCardinality) { - U32 minBitsSrc = ZSTD_highbit32((U32)(srcSize)) + 1; U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1; - U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols; - assert(srcSize > 1); /* Not supported, RLE should be used instead */ - return minBits; + return minBitsSymbols; } unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, size_t wkspSize, HUF_CElt* table, const unsigned* count, HUF_depth_mode depthMode) { unsigned optLogGuess = FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1); unsigned optLog = optLogGuess; + assert(srcSize > 1); /* Not supported, RLE should be used instead */ if (depthMode == HUF_depth_optimal) { /** Test valid depths and return optimal **/ BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp);