From d17138af60791397d98f0f991348ba88b30ab53e Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Fri, 10 Apr 2020 14:28:15 +0200 Subject: [PATCH] Fix #103 and comments for level and version numbers --- C/7zVersion.h | 6 +++--- C/zstdmt/brotli-mt_compress.c | 2 ++ C/zstdmt/lizard-mt_compress.c | 4 ++-- C/zstdmt/lz5-mt_compress.c | 4 ++-- CPP/7zip/Compress/Lz4Encoder.cpp | 3 +-- CPP/7zip/Compress/Lz5Encoder.cpp | 3 +-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/C/7zVersion.h b/C/7zVersion.h index 3ac3a042..5c4b1055 100644 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,7 +1,7 @@ #define MY_VER_MAJOR 19 #define MY_VER_MINOR 00 #define MY_VER_BUILD 0 -#define MY_VERSION_NUMBERS "19.00 ZS v1.4.4 R1" +#define MY_VERSION_NUMBERS "19.00 ZS v1.4.4 R2" #define MY_VERSION MY_VERSION_NUMBERS #ifdef MY_CPU_NAME @@ -10,12 +10,12 @@ #define MY_VERSION_CPU MY_VERSION #endif -#define MY_DATE "2019-11-13" +#define MY_DATE "2020-04-10" #undef MY_COPYRIGHT #undef MY_VERSION_COPYRIGHT_DATE #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt" #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain" -#define MY_COPYRIGHT_CR "Copyright (c) 1999-2019 Igor Pavlov, 2016-2019 Tino Reichardt" +#define MY_COPYRIGHT_CR "Copyright (c) 1999-2019 Igor Pavlov, 2016-2020 Tino Reichardt" #ifdef USE_COPYRIGHT_CR #define MY_COPYRIGHT MY_COPYRIGHT_CR diff --git a/C/zstdmt/brotli-mt_compress.c b/C/zstdmt/brotli-mt_compress.c index a18b2ac7..664f1ccb 100644 --- a/C/zstdmt/brotli-mt_compress.c +++ b/C/zstdmt/brotli-mt_compress.c @@ -48,6 +48,8 @@ struct writelist { }; struct BROTLIMT_CCtx_s { + + /* levels: 1..BROTLIMT_LEVEL_MAX */ int level; /* threads: 1..BROTLIMT_THREAD_MAX */ diff --git a/C/zstdmt/lizard-mt_compress.c b/C/zstdmt/lizard-mt_compress.c index 696d8f55..c678543f 100644 --- a/C/zstdmt/lizard-mt_compress.c +++ b/C/zstdmt/lizard-mt_compress.c @@ -51,7 +51,7 @@ struct writelist { struct LIZARDMT_CCtx_s { - /* level: 1..22 */ + /* level: 1..LIZARDMT_LEVEL_MAX */ int level; /* threads: 1..LIZARDMT_THREAD_MAX */ @@ -111,7 +111,7 @@ LIZARDMT_CCtx *LIZARDMT_createCCtx(int threads, int level, int inputsize) if (inputsize) ctx->inputsize = inputsize; else - ctx->inputsize = 1024 * 1024; + ctx->inputsize = 1024 * 1024 * 4; /* setup ctx */ ctx->level = level; diff --git a/C/zstdmt/lz5-mt_compress.c b/C/zstdmt/lz5-mt_compress.c index 4dfff6f6..6647f34a 100644 --- a/C/zstdmt/lz5-mt_compress.c +++ b/C/zstdmt/lz5-mt_compress.c @@ -51,7 +51,7 @@ struct writelist { struct LZ5MT_CCtx_s { - /* level: 1..22 */ + /* level: 1..LZ5MT_LEVEL_MAX */ int level; /* threads: 1..LZ5MT_THREAD_MAX */ @@ -111,7 +111,7 @@ LZ5MT_CCtx *LZ5MT_createCCtx(int threads, int level, int inputsize) if (inputsize) ctx->inputsize = inputsize; else - ctx->inputsize = 1024 * 64; + ctx->inputsize = 1024 * 1024 * 4; /* setup ctx */ ctx->level = level; diff --git a/CPP/7zip/Compress/Lz4Encoder.cpp b/CPP/7zip/Compress/Lz4Encoder.cpp index 2f9dbeab..9ae66cb6 100644 --- a/CPP/7zip/Compress/Lz4Encoder.cpp +++ b/CPP/7zip/Compress/Lz4Encoder.cpp @@ -1,4 +1,4 @@ -// (C) 2016 Tino Reichardt +// (C) 2016 - 2020 Tino Reichardt #include "StdAfx.h" #include "Lz4Encoder.h" @@ -40,7 +40,6 @@ STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARI if (prop.vt != VT_UI4) return E_INVALIDARG; - /* level 1..22 */ _props._level = static_cast < Byte > (prop.ulVal); Byte mylevel = static_cast < Byte > (LZ4MT_LEVEL_MAX); if (_props._level > mylevel) diff --git a/CPP/7zip/Compress/Lz5Encoder.cpp b/CPP/7zip/Compress/Lz5Encoder.cpp index 74ca938c..b587aca8 100644 --- a/CPP/7zip/Compress/Lz5Encoder.cpp +++ b/CPP/7zip/Compress/Lz5Encoder.cpp @@ -1,4 +1,4 @@ -// (C) 2016 Tino Reichardt +// (C) 2016 - 2020 Tino Reichardt #include "StdAfx.h" #include "Lz5Encoder.h" @@ -40,7 +40,6 @@ STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARI if (prop.vt != VT_UI4) return E_INVALIDARG; - /* level 1..22 */ _props._level = static_cast < Byte > (prop.ulVal); Byte mylevel = static_cast < Byte > (LZ5MT_LEVEL_MAX); if (_props._level > mylevel)