From 5828e1995efd2f8ee6edfb32e0e80fe5b45a2dd3 Mon Sep 17 00:00:00 2001 From: Pascal Massimino Date: Mon, 4 Apr 2016 00:18:49 -0700 Subject: [PATCH] use_8b_decode -> use_8b_decode_ Change-Id: I78e2b26c9bbe1364e5d048794528f9290606b545 --- src/dec/alphai.h | 6 +++--- src/dec/vp8l.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dec/alphai.h b/src/dec/alphai.h index 5fa230ca..b4170229 100644 --- a/src/dec/alphai.h +++ b/src/dec/alphai.h @@ -32,9 +32,9 @@ struct ALPHDecoder { int pre_processing_; struct VP8LDecoder* vp8l_dec_; VP8Io io_; - int use_8b_decode; // Although alpha channel requires only 1 byte per - // pixel, sometimes VP8LDecoder may need to allocate - // 4 bytes per pixel internally during decode. + int use_8b_decode_; // Although alpha channel requires only 1 byte per + // pixel, sometimes VP8LDecoder may need to allocate + // 4 bytes per pixel internally during decode. }; //------------------------------------------------------------------------------ diff --git a/src/dec/vp8l.c b/src/dec/vp8l.c index a76ad6a1..096c6a60 100644 --- a/src/dec/vp8l.c +++ b/src/dec/vp8l.c @@ -1492,11 +1492,11 @@ int VP8LDecodeAlphaHeader(ALPHDecoder* const alph_dec, if (dec->next_transform_ == 1 && dec->transforms_[0].type_ == COLOR_INDEXING_TRANSFORM && Is8bOptimizable(&dec->hdr_)) { - alph_dec->use_8b_decode = 1; + alph_dec->use_8b_decode_ = 1; ok = AllocateInternalBuffers8b(dec); } else { // 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_); } @@ -1520,7 +1520,7 @@ int VP8LDecodeAlphaImageStream(ALPHDecoder* const alph_dec, int last_row) { } // 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_, last_row) : DecodeImageData(dec, dec->pixels_, dec->width_, dec->height_,