dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 07:22:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

use_8b_decode -> use_8b_decode_

Browse Source 
Change-Id: I78e2b26c9bbe1364e5d048794528f9290606b545
This commit is contained in:
Pascal Massimino 2016-04-04 00:18:49 -07:00
parent 8dca0247d2
commit 5828e1995e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dec/alphai.h
View File

@ -32,9 +32,9 @@ struct ALPHDecoder {
int pre_processing_; int pre_processing_;
struct VP8LDecoder* vp8l_dec_; struct VP8LDecoder* vp8l_dec_;
VP8Io io_; VP8Io io_;
int use_8b_decode; // Although alpha channel requires only 1 byte per int use_8b_decode_; // Although alpha channel requires only 1 byte per
// pixel, sometimes VP8LDecoder may need to allocate // pixel, sometimes VP8LDecoder may need to allocate
// 4 bytes per pixel internally during decode. // 4 bytes per pixel internally during decode.
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

6
src/dec/vp8l.c
View File

@ -1492,11 +1492,11 @@ int VP8LDecodeAlphaHeader(ALPHDecoder* const alph_dec,
if (dec->next_transform_ == 1 && if (dec->next_transform_ == 1 &&
dec->transforms_[0].type_ == COLOR_INDEXING_TRANSFORM && dec->transforms_[0].type_ == COLOR_INDEXING_TRANSFORM &&
Is8bOptimizable(&dec->hdr_)) { Is8bOptimizable(&dec->hdr_)) {
alph_dec->use_8b_decode = 1; alph_dec->use_8b_decode_ = 1;
ok = AllocateInternalBuffers8b(dec); ok = AllocateInternalBuffers8b(dec);
} else { } else {
// Allocate internal buffers (note that dec->width_ may have changed here). // Allocate internal buffers (note that dec->width_ may have changed here).
alph_dec->use_8b_decode = 0; alph_dec->use_8b_decode_ = 0;
ok = AllocateInternalBuffers32b(dec, alph_dec->width_); ok = AllocateInternalBuffers32b(dec, alph_dec->width_);
} }
@ -1520,7 +1520,7 @@ int VP8LDecodeAlphaImageStream(ALPHDecoder* const alph_dec, int last_row) {
} }
// Decode (with special row processing). // Decode (with special row processing).
return alph_dec->use_8b_decode ? return alph_dec->use_8b_decode_ ?
DecodeAlphaData(dec, (uint8_t*)dec->pixels_, dec->width_, dec->height_, DecodeAlphaData(dec, (uint8_t*)dec->pixels_, dec->width_, dec->height_,
last_row) : last_row) :
DecodeImageData(dec, dec->pixels_, dec->width_, dec->height_, DecodeImageData(dec, dec->pixels_, dec->width_, dec->height_,