X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fxpress-compress.c;h=1b3951d0a60e92a857659fc686b516d65edb3ec9;hp=2b3a6a6e9d980a14ce7ca2e6f062b5505c53656a;hb=a2984b07d10ef6b49a509cf0289bd9dc824e42e7;hpb=c9812a5d413382b81552979b10e5c478b3721316 diff --git a/src/xpress-compress.c b/src/xpress-compress.c index 2b3a6a6e..1b3951d0 100644 --- a/src/xpress-compress.c +++ b/src/xpress-compress.c @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -90,7 +90,7 @@ static int xpress_write_compressed_literals(struct output_bitstream *ostream, static u32 xpress_record_literal(u8 literal, void *__freq_tab) { - u32 *freq_tab = __freq_tab; + freq_t *freq_tab = __freq_tab; freq_tab[literal]++; return literal; } @@ -121,7 +121,7 @@ static u32 xpress_record_match(unsigned match_offset, unsigned match_len, u32 len_hdr = min(adjusted_match_len, 0xf); u32 offset_bsr = bsr32(match_offset); u32 sym = len_hdr | (offset_bsr << 4) | XPRESS_NUM_CHARS; - ((u32*)freq_tab)[sym]++; + ((freq_t*)freq_tab)[sym]++; return adjusted_match_len | (match_offset << 16); } @@ -159,7 +159,7 @@ int xpress_compress(const void *__uncompressed_data, unsigned uncompressed_len, u8 *compressed_data = __compressed_data; struct output_bitstream ostream; u32 match_tab[uncompressed_len]; - u32 freq_tab[XPRESS_NUM_SYMBOLS]; + freq_t freq_tab[XPRESS_NUM_SYMBOLS]; u16 codewords[XPRESS_NUM_SYMBOLS]; u8 lens[XPRESS_NUM_SYMBOLS]; unsigned num_matches;