dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "fix big-endian VP8LWriteBits"

Browse Source
This commit is contained in:
pascal massimino 2012-07-02 14:38:32 -07:00 committed by Gerrit Code Review
commit 88a510ff53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/bit_writer.c
View File

@ -230,7 +230,7 @@ void VP8LWriteBits(VP8LBitWriter* const bw, int n_bits, uint32_t bits) {
if (n_bits < 1) return; if (n_bits < 1) return;
#if !defined(__BIG_ENDIAN__) #if !defined(__BIG_ENDIAN__)
// Technically, this branch of the code can write up to 25 bits at a time, // Technically, this branch of the code can write up to 25 bits at a time,
// but in deflate, the maximum number of bits written is 16 at a time. // but in prefix encoding, the maximum number of bits written is 18 at a time.
{ {
uint8_t* p = &bw->buf_[bw->bit_pos_ >> 3]; uint8_t* p = &bw->buf_[bw->bit_pos_ >> 3];
uint32_t v = *(const uint32_t*)(p); uint32_t v = *(const uint32_t*)(p);
@ -251,7 +251,8 @@ void VP8LWriteBits(VP8LBitWriter* const bw, int n_bits, uint32_t bits) {
*p++ = bits >> (16 - bits_reserved_in_first_byte); *p++ = bits >> (16 - bits_reserved_in_first_byte);
} }
} }
*p = 0; assert(n_bits <= 25);
*p = bits >> (24 - bits_reserved_in_first_byte);
bw->bit_pos_ += n_bits; bw->bit_pos_ += n_bits;
} }
#endif // BIG_ENDIAN #endif // BIG_ENDIAN