From: inikep Date: Thu, 9 Jun 2016 16:12:06 +0000 (+0200) Subject: project updated for legacy decoder zstd_v06.c X-Git-Tag: v0.7.0^2~35^2^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4000945a1da5dc5d139b94365c132a02b4fe53ed;p=thirdparty%2Fzstd.git project updated for legacy decoder zstd_v06.c --- diff --git a/lib/legacy/zstd_v06.c b/lib/legacy/zstd_v06.c index 483839695..6ee0d44a1 100644 --- a/lib/legacy/zstd_v06.c +++ b/lib/legacy/zstd_v06.c @@ -521,48 +521,6 @@ extern "C" { - -/*-************************************* -* Types -***************************************/ -#define ZSTDv06_WINDOWLOG_MAX ((U32)(MEM_32bits() ? 25 : 27)) -#define ZSTDv06_WINDOWLOG_MIN 18 -#define ZSTDv06_CHAINLOG_MAX (ZSTDv06_WINDOWLOG_MAX+1) -#define ZSTDv06_CHAINLOG_MIN 4 -#define ZSTDv06_HASHLOG_MAX ZSTDv06_WINDOWLOG_MAX -#define ZSTDv06_HASHLOG_MIN 12 -#define ZSTDv06_HASHLOG3_MAX 17 -#define ZSTDv06_HASHLOG3_MIN 15 -#define ZSTDv06_SEARCHLOG_MAX (ZSTDv06_WINDOWLOG_MAX-1) -#define ZSTDv06_SEARCHLOG_MIN 1 -#define ZSTDv06_SEARCHLENGTH_MAX 7 -#define ZSTDv06_SEARCHLENGTH_MIN 3 -#define ZSTDv06_TARGETLENGTH_MIN 4 -#define ZSTDv06_TARGETLENGTH_MAX 999 - -/* from faster to stronger */ -typedef enum { ZSTDv06_fast, ZSTDv06_greedy, ZSTDv06_lazy, ZSTDv06_lazy2, ZSTDv06_btlazy2, ZSTDv06_btopt } ZSTDv06_strategy; - -typedef struct { - U32 windowLog; /* largest match distance : larger == more compression, more memory needed during decompression */ - U32 chainLog; /* fully searched segment : larger == more compression, slower, more memory (useless for fast) */ - U32 hashLog; /* dispatch table : larger == faster, more memory */ - U32 searchLog; /* nb of searches : larger == more compression, slower */ - U32 searchLength; /* match length searched : larger == faster decompression, sometimes less compression */ - U32 targetLength; /* acceptable match size for optimal parser (only) : larger == more compression, slower */ - ZSTDv06_strategy strategy; -} ZSTDv06_compressionParameters; - -typedef struct { - U32 contentSizeFlag; /* 1: content size will be in frame header (if known). */ -} ZSTDv06_frameParameters; - -typedef struct { - ZSTDv06_compressionParameters cParams; - ZSTDv06_frameParameters fParams; -} ZSTDv06_parameters; - - /*- Advanced Decompression functions -*/ /*! ZSTDv06_decompress_usingPreparedDCtx() : diff --git a/projects/VS2008/zstd/zstd.vcproj b/projects/VS2008/zstd/zstd.vcproj index 38b769349..b9b0d1ec6 100644 --- a/projects/VS2008/zstd/zstd.vcproj +++ b/projects/VS2008/zstd/zstd.vcproj @@ -424,6 +424,10 @@ RelativePath="..\..\..\lib\legacy\zstd_v05.c" > + + @@ -530,6 +534,10 @@ RelativePath="..\..\..\lib\legacy\zstd_v05.h" > + + diff --git a/projects/VS2010/zstd/zstd.vcxproj b/projects/VS2010/zstd/zstd.vcxproj index 40cb20de7..fbbb4d019 100644 --- a/projects/VS2010/zstd/zstd.vcxproj +++ b/projects/VS2010/zstd/zstd.vcxproj @@ -37,6 +37,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/projects/VS2010/zstd/zstd.vcxproj.filters b/projects/VS2010/zstd/zstd.vcxproj.filters index 4c1a64a69..49d939169 100644 --- a/projects/VS2010/zstd/zstd.vcxproj.filters +++ b/projects/VS2010/zstd/zstd.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -23,30 +23,33 @@ Source Files - + Source Files - + Source Files Source Files - + Source Files - + Source Files - + Source Files - + Source Files Source Files + + Source Files + Source Files @@ -94,25 +97,31 @@ Header Files - + + Header Files + + Header Files Header Files - + Header Files - + Header Files Header Files - + Header Files - + + Header Files + + Header Files @@ -157,9 +166,6 @@ Header Files - - Header Files - Header Files diff --git a/projects/cmake/lib/CMakeLists.txt b/projects/cmake/lib/CMakeLists.txt index 3b988fd16..35553b994 100644 --- a/projects/cmake/lib/CMakeLists.txt +++ b/projects/cmake/lib/CMakeLists.txt @@ -92,7 +92,8 @@ IF (ZSTD_LEGACY_SUPPORT) ${LIBRARY_LEGACY_DIR}/zstd_v02.c ${LIBRARY_LEGACY_DIR}/zstd_v03.c ${LIBRARY_LEGACY_DIR}/zstd_v04.c - ${LIBRARY_LEGACY_DIR}/zstd_v05.c) + ${LIBRARY_LEGACY_DIR}/zstd_v05.c + ${LIBRARY_LEGACY_DIR}/zstd_v06.c) SET(Headers ${Headers} ${LIBRARY_LEGACY_DIR}/zstd_legacy.h @@ -100,7 +101,8 @@ IF (ZSTD_LEGACY_SUPPORT) ${LIBRARY_LEGACY_DIR}/zstd_v02.h ${LIBRARY_LEGACY_DIR}/zstd_v03.h ${LIBRARY_LEGACY_DIR}/zstd_v04.h - ${LIBRARY_LEGACY_DIR}/zstd_v05.h) + ${LIBRARY_LEGACY_DIR}/zstd_v05.h + ${LIBRARY_LEGACY_DIR}/zstd_v06.h) ENDIF (ZSTD_LEGACY_SUPPORT) IF (MSVC)