Add independent LZMS decompressor

[wimlib] / src / compress.c

diff --git a/src/compress.c b/src/compress.c
index 76043d632b98f6f3e670c948f5f09b8d62521d90..c121511b32b706df50e43389748d444bc16db40a 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "wimlib/assert.h"
+#include "wimlib/endianness.h"
 #include "wimlib/compiler.h"
 #include "wimlib/compress.h"
 #include "wimlib/util.h"
@@ -126,7 +127,7 @@ init_output_bitstream(struct output_bitstream *ostream,
 }
 
 typedef struct {
-       freq_t freq;
+       input_idx_t freq;
        u16 sym;
        union {
                u16 path_len;
@@ -250,7 +251,7 @@ huffman_tree_compute_path_lengths(HuffmanNode *base_node, u16 cur_len)
 void
 make_canonical_huffman_code(unsigned num_syms,
                            unsigned max_codeword_len,
-                           const freq_t freq_tab[restrict],
+                           const input_idx_t freq_tab[restrict],
                            u8 lens[restrict],
                            u16 codewords[restrict])
 {
@@ -427,8 +428,8 @@ try_building_tree_again:
                         * log_2(num_used_symbols).
                         * */
                        for (unsigned i = 0; i < num_used_symbols; i++)
-                               if (leaves[i].freq > 1)
-                                       leaves[i].freq >>= 1;
+                               leaves[i].freq = (leaves[i].freq + 1) >> 1;
+
                        goto try_building_tree_again;
                }
                next_inode++;