From cb009c8652e4f3654d666a64d962d48d4ddc2f65 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 21 Mar 2018 17:40:55 +0000 Subject: Rename "des_foo" to "dest_foo". Destination variables usually have "dest" or "dst" as the prefix. Change-Id: If5bb01a5eafe1e4b42d1a6d653abb1b444b1b2fa Reviewed-on: https://pdfium-review.googlesource.com/28970 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- core/fxcodec/gif/cfx_lzwdecompressor.cpp | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'core/fxcodec/gif/cfx_lzwdecompressor.cpp') diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.cpp b/core/fxcodec/gif/cfx_lzwdecompressor.cpp index 09df6e767b..d4fd43d321 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.cpp +++ b/core/fxcodec/gif/cfx_lzwdecompressor.cpp @@ -44,12 +44,12 @@ CFX_LZWDecompressor::~CFX_LZWDecompressor() {} CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, uint32_t src_size, - uint8_t* des_buf, - uint32_t* des_size) { - if (!src_buf || src_size == 0 || !des_buf || !des_size) + uint8_t* dest_buf, + uint32_t* dest_size) { + if (!src_buf || src_size == 0 || !dest_buf || !dest_size) return CFX_GifDecodeStatus::Error; - if (*des_size == 0) + if (*dest_size == 0) return CFX_GifDecodeStatus::InsufficientDestSize; next_in_ = src_buf; @@ -59,15 +59,15 @@ CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, uint32_t i = 0; if (decompressed_next_ != 0) { - uint32_t extracted_size = ExtractData(des_buf, *des_size); + uint32_t extracted_size = ExtractData(dest_buf, *dest_size); if (decompressed_next_ != 0) return CFX_GifDecodeStatus::InsufficientDestSize; - des_buf += extracted_size; + dest_buf += extracted_size; i += extracted_size; } - while (i <= *des_size && (avail_in_ > 0 || bits_left_ >= code_size_cur_)) { + while (i <= *dest_size && (avail_in_ > 0 || bits_left_ >= code_size_cur_)) { if (code_size_cur_ > GIF_MAX_LZW_EXP) return CFX_GifDecodeStatus::Error; @@ -96,7 +96,7 @@ CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, continue; } if (code == code_end_) { - *des_size = i; + *dest_size = i; return CFX_GifDecodeStatus::Success; } @@ -122,11 +122,11 @@ CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, } code_old_ = code; - uint32_t extracted_size = ExtractData(des_buf, *des_size - i); + uint32_t extracted_size = ExtractData(dest_buf, *dest_size - i); if (decompressed_next_ != 0) return CFX_GifDecodeStatus::InsufficientDestSize; - des_buf += extracted_size; + dest_buf += extracted_size; i += extracted_size; } } @@ -134,7 +134,7 @@ CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, if (avail_in_ != 0) return CFX_GifDecodeStatus::Error; - *des_size = i; + *dest_size = i; return CFX_GifDecodeStatus::Unfinished; } @@ -182,15 +182,16 @@ bool CFX_LZWDecompressor::DecodeString(uint16_t code) { return true; } -uint32_t CFX_LZWDecompressor::ExtractData(uint8_t* des_buf, uint32_t des_size) { - if (des_size == 0) +uint32_t CFX_LZWDecompressor::ExtractData(uint8_t* dest_buf, + uint32_t dest_size) { + if (dest_size == 0) return 0; - uint32_t copy_size = des_size <= decompressed_next_ - ? des_size + uint32_t copy_size = dest_size <= decompressed_next_ + ? dest_size : static_cast(decompressed_next_); std::reverse_copy(decompressed_.data() + decompressed_next_ - copy_size, - decompressed_.data() + decompressed_next_, des_buf); + decompressed_.data() + decompressed_next_, dest_buf); decompressed_next_ -= copy_size; return copy_size; } -- cgit v1.2.3