Updated forceAttachDict param bounds

dev
Sen Huang 2019-10-20 22:01:08 -04:00
parent 8f69c47643
commit 1f3a51fb52
2 changed files with 3 additions and 3 deletions

View File

@ -387,7 +387,7 @@ ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter param)
case ZSTD_c_forceAttachDict:
ZSTD_STATIC_ASSERT(ZSTD_dictDefaultAttach < ZSTD_dictForceCopy);
bounds.lowerBound = ZSTD_dictDefaultAttach;
bounds.upperBound = ZSTD_dictForceCopy; /* note : how to ensure at compile time that this is the highest value enum ? */
bounds.upperBound = ZSTD_dictForceSource; /* note : how to ensure at compile time that this is the highest value enum ? */
return bounds;
case ZSTD_c_literalCompressionMode:
@ -3358,7 +3358,7 @@ size_t ZSTD_compressBegin_usingCDict_advanced(
RETURN_ERROR_IF(cdict==NULL, dictionary_wrong);
{ ZSTD_CCtx_params params = cctx->requestedParams;
params.cParams = ( (pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_CUTOFF) || (cdict->compressionLevel == 0) )
&& (params->attachDictPref != ZSTD_dictForceSource) ?
&& (params.attachDictPref != ZSTD_dictForceSource) ?
ZSTD_getCParamsFromCDict(cdict)
: ZSTD_getCParams(cdict->compressionLevel,
pledgedSrcSize,

View File

@ -1177,7 +1177,7 @@ typedef enum {
ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */
ZSTD_dictForceAttach = 1, /* Never copy the dictionary. */
ZSTD_dictForceCopy = 2, /* Always copy the dictionary. */
ZSTD_dictForceSource = 3, /* Always use src input to determine tables */
ZSTD_dictForceSource = 3, /* Always use src input to determine tables */
} ZSTD_dictAttachPref_e;
typedef enum {