diff options
| author | Zhang, Shenglei <shenglei.zhang@intel.com> | 2019-09-30 11:52:28 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2019-09-30 15:04:08 +0800 |
| commit | f835e1d4c187014742fbd766ec2fbc07ef5384ba (patch) | |
| tree | 1ebec16b30a6843513866f2b478b95cf2180bed2 | |
| parent | ac81789c3b3093a1efffc82333a7c13b8d814222 (diff) | |
| download | edk2-f835e1d4c187014742fbd766ec2fbc07ef5384ba.zip edk2-f835e1d4c187014742fbd766ec2fbc07ef5384ba.tar.gz edk2-f835e1d4c187014742fbd766ec2fbc07ef5384ba.tar.bz2 | |
BaseTools/LzmaCompress: Fix the option "d" dictionary size
The range of dictionary size is set from [0,30] to [0,27].
And update the help information for this.
The previous logic for processing the parameter dict size is incorrect.
Now fix the logic.
The option "d" is added at 6b80310f34199d1f62e45e40fa902734735091fa.
(https://bugzilla.tianocore.org/show_bug.cgi?id=2077)
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
| -rw-r--r-- | BaseTools/Source/C/LzmaCompress/LzmaCompress.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c index 856fcf9..bebdb9a 100644 --- a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c +++ b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c @@ -42,7 +42,7 @@ const char *kInvalidParamValMessage = "Invalid parameter value"; static Bool mQuietMode = False;
static CONVERTER_TYPE mConType = NoConverter;
-UINT64 mDictionarySize = 31;
+UINT64 mDictionarySize = 28;
UINT64 mCompressionMode = 2;
#define UTILITY_NAME "LzmaCompress"
@@ -64,7 +64,7 @@ void PrintHelp(char *buffer) " -q, --quiet: reduce output messages\n"
" --debug [0-9]: set debug level\n"
" -a: set compression mode 0 = fast, 1 = normal, default: 1 (normal)\n"
- " d: sets Dictionary size - [0, 30], default: 23 (8MB)\n"
+ " d: sets Dictionary size - [0, 27], default: 24 (16MB)\n"
" --version: display the program version and exit\n"
" -h, --help: display this help text\n"
);
@@ -298,8 +298,12 @@ int main2(int numArgs, const char *args[], char *rs) }
} else if (strcmp(args[param], "d") == 0) {
AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);
- if (mDictionarySize <= 30){
- props.dictSize = (UINT32)mDictionarySize;
+ if (mDictionarySize <= 27) {
+ if (mDictionarySize == 0) {
+ props.dictSize = 0;
+ } else {
+ props.dictSize = (1 << mDictionarySize);
+ }
param++;
continue;
} else {
|