aboutsummaryrefslogtreecommitdiff
path: root/c/dec
diff options
context:
space:
mode:
authorEugene Kliuchnikov <eustas@google.com>2018-06-11 15:17:26 +0200
committerGitHub <noreply@github.com>2018-06-11 15:17:26 +0200
commit09cd3e877f583e6352be146ab22415298366c8d6 (patch)
tree0821b6990772332b57c6cb37ed045af7fbbbc9d7 /c/dec
parent8544ae858d87056c8dac55713ffe148d9c60eb93 (diff)
downloadbrotli-09cd3e877f583e6352be146ab22415298366c8d6.zip
brotli-09cd3e877f583e6352be146ab22415298366c8d6.tar.gz
brotli-09cd3e877f583e6352be146ab22415298366c8d6.tar.bz2
Update
Diffstat (limited to 'c/dec')
-rw-r--r--c/dec/bit_reader.h2
-rw-r--r--c/dec/decode.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/c/dec/bit_reader.h b/c/dec/bit_reader.h
index 39e4873..c06e914 100644
--- a/c/dec/bit_reader.h
+++ b/c/dec/bit_reader.h
@@ -238,7 +238,7 @@ static BROTLI_INLINE void BrotliTakeBits(
BrotliBitReader* const br, uint32_t n_bits, uint32_t* val) {
*val = (uint32_t)BrotliGetBitsUnmasked(br) & BitMask(n_bits);
BROTLI_LOG(("[BrotliReadBits] %d %d %d val: %6x\n",
- (int)br->avail_in, (int)br->bit_pos_, n_bits, (int)*val));
+ (int)br->avail_in, (int)br->bit_pos_, (int)n_bits, (int)*val));
BrotliDropBits(br, n_bits);
}
diff --git a/c/dec/decode.c b/c/dec/decode.c
index 278b622..674b829 100644
--- a/c/dec/decode.c
+++ b/c/dec/decode.c
@@ -516,7 +516,8 @@ static BROTLI_INLINE void ProcessSingleCodeLength(uint32_t code_len,
*prev_code_len = code_len;
*space -= 32768U >> code_len;
code_length_histo[code_len]++;
- BROTLI_LOG(("[ReadHuffmanCode] code_length[%d] = %d\n", *symbol, code_len));
+ BROTLI_LOG(("[ReadHuffmanCode] code_length[%d] = %d\n",
+ (int)*symbol, (int)code_len));
}
(*symbol)++;
}
@@ -561,7 +562,7 @@ static BROTLI_INLINE void ProcessRepeatedCodeLength(uint32_t code_len,
return;
}
BROTLI_LOG(("[ReadHuffmanCode] code_length[%d..%d] = %d\n",
- *symbol, *symbol + repeat_delta - 1, *repeat_code_len));
+ (int)*symbol, (int)(*symbol + repeat_delta - 1), (int)*repeat_code_len));
if (*repeat_code_len != 0) {
unsigned last = *symbol + repeat_delta;
int next = next_symbol[*repeat_code_len];
@@ -832,7 +833,7 @@ static BrotliDecoderErrorCode ReadHuffmanCode(uint32_t alphabet_size,
}
if (s->space != 0) {
- BROTLI_LOG(("[ReadHuffmanCode] space = %d\n", s->space));
+ BROTLI_LOG(("[ReadHuffmanCode] space = %d\n", (int)s->space));
return BROTLI_FAILURE(BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE);
}
table_size = BrotliBuildHuffmanTable(