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

Color cache size should be counted as 0 when cache bits = 0

Browse Source 
Change-Id: I1d05e0561a92aebaf62162fe11ffc4b12496d698
This commit is contained in:
Urvang Joshi 2012-04-17 10:07:34 +00:00 committed by James Zern
parent 4f0c5caf67
commit 54dad7e553
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/enc/vp8l.c
View File

@ -743,7 +743,8 @@ static int EncodeImageInternal(VP8LBitWriter* const bw,
uint16_t** bit_codes = NULL; uint16_t** bit_codes = NULL;
const int use_2d_locality = 1; const int use_2d_locality = 1;
int backward_refs_size; int backward_refs_size;
const int use_color_cache = cache_bits ? 1 : 0; const int use_color_cache = (cache_bits > 0) ? 1 : 0;
const int color_cache_size = use_color_cache ? (1 << cache_bits) : 0;
const int histogram_image_xysize = VP8LSubSampleSize(width, histogram_bits) * const int histogram_image_xysize = VP8LSubSampleSize(width, histogram_bits) *
VP8LSubSampleSize(height, histogram_bits); VP8LSubSampleSize(height, histogram_bits);
VP8LHistogram** histogram_image; VP8LHistogram** histogram_image;
@ -826,7 +827,7 @@ static int EncodeImageInternal(VP8LBitWriter* const bw,
for (k = 0; k < 5; ++k) { for (k = 0; k < 5; ++k) {
const uint8_t* const cur_bit_lengths = bit_lengths[5 * i + k]; const uint8_t* const cur_bit_lengths = bit_lengths[5 * i + k];
const int cur_bit_lengths_size = (k == 0) ? const int cur_bit_lengths_size = (k == 0) ?
256 + kLengthCodes + (1 << cache_bits) : 256 + kLengthCodes + color_cache_size :
bit_lengths_sizes[5 * i + k]; bit_lengths_sizes[5 * i + k];
if (!StoreHuffmanCode(bw, cur_bit_lengths, cur_bit_lengths_size)) { if (!StoreHuffmanCode(bw, cur_bit_lengths, cur_bit_lengths_size)) {
goto Error; goto Error;