Rename local variables in CPDF_StreamParser::ReadInlineStream() Use Google C++ names. Bug: 42271580 Change-Id: I8905924aba9ef4895785528ba34981453176bef7 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/127852 Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Thomas Sepez <tsepez@google.com> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp index 2141d2f..9629663 100644 --- a/core/fpdfapi/page/cpdf_streamparser.cpp +++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -135,26 +135,29 @@ CPDF_Document* pDoc, RetainPtr<CPDF_Dictionary> pDict, const CPDF_Object* pCSObj) { - if (m_Pos < m_pBuf.size() && PDFCharIsWhitespace(m_pBuf[m_Pos])) + if (m_Pos < m_pBuf.size() && PDFCharIsWhitespace(m_pBuf[m_Pos])) { m_Pos++; + } - if (m_Pos == m_pBuf.size()) + if (m_Pos == m_pBuf.size()) { return nullptr; + } ByteString decoder; - RetainPtr<const CPDF_Dictionary> pParam; - RetainPtr<const CPDF_Object> pFilter = pDict->GetDirectObjectFor("Filter"); - if (pFilter) { - const CPDF_Array* pArray = pFilter->AsArray(); - if (pArray) { - decoder = pArray->GetByteStringAt(0); - RetainPtr<const CPDF_Array> pParams = + RetainPtr<const CPDF_Dictionary> param_dict; + RetainPtr<const CPDF_Object> filter = pDict->GetDirectObjectFor("Filter"); + if (filter) { + const CPDF_Array* array = filter->AsArray(); + if (array) { + decoder = array->GetByteStringAt(0); + RetainPtr<const CPDF_Array> params = pDict->GetArrayFor(pdfium::stream::kDecodeParms); - if (pParams) - pParam = pParams->GetDictAt(0); + if (params) { + param_dict = params->GetDictAt(0); + } } else { - decoder = pFilter->GetString(); - pParam = pDict->GetDictFor(pdfium::stream::kDecodeParms); + decoder = filter->GetString(); + param_dict = pDict->GetDictFor(pdfium::stream::kDecodeParms); } } uint32_t width = pDict->GetIntegerFor("Width"); @@ -169,54 +172,58 @@ } std::optional<uint32_t> maybe_size = fxge::CalculatePitch8(bpc, nComponents, width); - if (!maybe_size.has_value()) + if (!maybe_size.has_value()) { return nullptr; + } FX_SAFE_UINT32 size = maybe_size.value(); size *= height; - if (!size.IsValid()) + if (!size.IsValid()) { return nullptr; + } - uint32_t dwOrigSize = size.ValueOrDie(); + uint32_t original_size = size.ValueOrDie(); DataVector<uint8_t> data; - uint32_t dwStreamSize; + uint32_t stream_size; if (decoder.IsEmpty()) { - dwOrigSize = std::min<uint32_t>(dwOrigSize, m_pBuf.size() - m_Pos); - auto src_span = m_pBuf.subspan(m_Pos, dwOrigSize); + original_size = std::min<uint32_t>(original_size, m_pBuf.size() - m_Pos); + auto src_span = m_pBuf.subspan(m_Pos, original_size); data = DataVector<uint8_t>(src_span.begin(), src_span.end()); - dwStreamSize = dwOrigSize; - m_Pos += dwOrigSize; + stream_size = original_size; + m_Pos += original_size; } else { - dwStreamSize = DecodeInlineStream(m_pBuf.subspan(m_Pos), width, height, - decoder, std::move(pParam), dwOrigSize); - if (!pdfium::IsValueInRangeForNumericType<int>(dwStreamSize)) { + stream_size = + DecodeInlineStream(m_pBuf.subspan(m_Pos), width, height, decoder, + std::move(param_dict), original_size); + if (!pdfium::IsValueInRangeForNumericType<int>(stream_size)) { return nullptr; } - uint32_t dwSavePos = m_Pos; - m_Pos += dwStreamSize; + uint32_t saved_position = m_Pos; + m_Pos += stream_size; while (true) { - uint32_t dwPrevPos = m_Pos; + uint32_t saved_iteration_position = m_Pos; ElementType type = ParseNextElement(); - if (type == ElementType::kEndOfData) + if (type == ElementType::kEndOfData) { break; + } if (type != ElementType::kKeyword) { - dwStreamSize += m_Pos - dwPrevPos; + stream_size += m_Pos - saved_iteration_position; continue; } if (GetWord() == "EI") { - m_Pos = dwPrevPos; + m_Pos = saved_iteration_position; break; } - dwStreamSize += m_Pos - dwPrevPos; + stream_size += m_Pos - saved_iteration_position; } - m_Pos = dwSavePos; - auto src_span = m_pBuf.subspan(m_Pos, dwStreamSize); + m_Pos = saved_position; + auto src_span = m_pBuf.subspan(m_Pos, stream_size); data = DataVector<uint8_t>(src_span.begin(), src_span.end()); - m_Pos += dwStreamSize; + m_Pos += stream_size; } - pDict->SetNewFor<CPDF_Number>("Length", static_cast<int>(dwStreamSize)); + pDict->SetNewFor<CPDF_Number>("Length", static_cast<int>(stream_size)); return pdfium::MakeRetain<CPDF_Stream>(std::move(data), std::move(pDict)); }