From cdef89de0ea578a85bbae9b5bd3751d4a6e0d2be Mon Sep 17 00:00:00 2001 From: Pascal Massimino Date: Tue, 26 Apr 2011 01:03:58 -0700 Subject: [PATCH] fix some 'unused variable' warning Change-Id: I1d2747480675b68f57d7ef7bf0b0010d267cb32b --- src/enc/alpha.c | 15 +++++++-------- src/enc/syntax.c | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/enc/alpha.c b/src/enc/alpha.c index dc764e59..cdacb6c8 100644 --- a/src/enc/alpha.c +++ b/src/enc/alpha.c @@ -71,17 +71,16 @@ static int CompressAlpha(const uint8_t* data, size_t data_size, #endif /* WEBP_EXPERIMENTAL_FEATURES */ int VP8EncProcessAlpha(VP8Encoder* enc) { - const WebPPicture* pic_ = enc->pic_; enc->alpha_data_ = NULL; enc->alpha_data_size_ = 0; #ifdef WEBP_EXPERIMENTAL_FEATURES - if (pic_->a == NULL) { - return 1; - } - if (!CompressAlpha(pic_->a, pic_->width * pic_->height, - &enc->alpha_data_, &enc->alpha_data_size_, - enc->config_->alpha_compression)) { - return 0; + if (enc->pic_->a) { + const WebPPicture* pic = enc->pic_; + if (!CompressAlpha(pic->a, pic->width * pic->height, + &enc->alpha_data_, &enc->alpha_data_size_, + enc->config_->alpha_compression)) { + return 0; + } } #endif /* WEBP_EXPERIMENTAL_FEATURES */ return 1; diff --git a/src/enc/syntax.c b/src/enc/syntax.c index 3ddcad88..7daabff3 100644 --- a/src/enc/syntax.c +++ b/src/enc/syntax.c @@ -176,6 +176,8 @@ static int WriteExtensions(VP8Encoder* const enc) { if (!VP8BitWriterAppend(bw, trailer, EXT_SIZE)) { return 0; } +#else + (void)enc; // remove 'unused variable' warning #endif return 1; }