#endif
#include "wimlib/assert.h"
+#include "wimlib/endianness.h"
#include "wimlib/compiler.h"
#include "wimlib/compress.h"
#include "wimlib/util.h"
}
typedef struct {
- freq_t freq;
+ input_idx_t freq;
u16 sym;
union {
u16 path_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])
{
* 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++;