diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-11-29 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-11-30 15:27:15 +0500 |
| commit | e5431fa6f5505e385c6f9367260717e9c47dc2ee (patch) | |
| tree | 4cd2c2c3b225b48c8e7053432c41d7b6b6a3d5f8 /C/LzmaEnc.c | |
| parent | e008ce3976c087bfd21344af8f00a23cf69d4174 (diff) | |
| download | 7zip-main.tar.gz 7zip-main.tar.bz2 7zip-main.zip | |
Diffstat (limited to 'C/LzmaEnc.c')
| -rw-r--r-- | C/LzmaEnc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/C/LzmaEnc.c b/C/LzmaEnc.c index 37b2787..088b78f 100644 --- a/C/LzmaEnc.c +++ b/C/LzmaEnc.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* LzmaEnc.c -- LZMA Encoder | 1 | /* LzmaEnc.c -- LZMA Encoder |
| 2 | 2024-01-24: Igor Pavlov : Public domain */ | 2 | Igor Pavlov : Public domain */ |
| 3 | 3 | ||
| 4 | #include "Precomp.h" | 4 | #include "Precomp.h" |
| 5 | 5 | ||
| @@ -72,11 +72,11 @@ void LzmaEncProps_Normalize(CLzmaEncProps *p) | |||
| 72 | p->level = level; | 72 | p->level = level; |
| 73 | 73 | ||
| 74 | if (p->dictSize == 0) | 74 | if (p->dictSize == 0) |
| 75 | p->dictSize = | 75 | p->dictSize = (unsigned)level <= 4 ? |
| 76 | ( level <= 3 ? ((UInt32)1 << (level * 2 + 16)) : | 76 | (UInt32)1 << (level * 2 + 16) : |
| 77 | ( level <= 6 ? ((UInt32)1 << (level + 19)) : | 77 | (unsigned)level <= sizeof(size_t) / 2 + 4 ? |
| 78 | ( level <= 7 ? ((UInt32)1 << 25) : ((UInt32)1 << 26) | 78 | (UInt32)1 << (level + 20) : |
| 79 | ))); | 79 | (UInt32)1 << (sizeof(size_t) / 2 + 24); |
| 80 | 80 | ||
| 81 | if (p->dictSize > p->reduceSize) | 81 | if (p->dictSize > p->reduceSize) |
| 82 | { | 82 | { |
| @@ -92,8 +92,8 @@ void LzmaEncProps_Normalize(CLzmaEncProps *p) | |||
| 92 | if (p->lp < 0) p->lp = 0; | 92 | if (p->lp < 0) p->lp = 0; |
| 93 | if (p->pb < 0) p->pb = 2; | 93 | if (p->pb < 0) p->pb = 2; |
| 94 | 94 | ||
| 95 | if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); | 95 | if (p->algo < 0) p->algo = (unsigned)level < 5 ? 0 : 1; |
| 96 | if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); | 96 | if (p->fb < 0) p->fb = (unsigned)level < 7 ? 32 : 64; |
| 97 | if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); | 97 | if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); |
| 98 | if (p->numHashBytes < 0) p->numHashBytes = (p->btMode ? 4 : 5); | 98 | if (p->numHashBytes < 0) p->numHashBytes = (p->btMode ? 4 : 5); |
| 99 | if (p->mc == 0) p->mc = (16 + ((unsigned)p->fb >> 1)) >> (p->btMode ? 0 : 1); | 99 | if (p->mc == 0) p->mc = (16 + ((unsigned)p->fb >> 1)) >> (p->btMode ? 0 : 1); |