Give "pMap" variables better names
Rename variables with this name to follow Google C++ style. Use names
based on the object type. Also rename "pMapStream".
Bug: 42271580
Change-Id: Ia7813fe0798aeba9c506830dff3e9c3cd02aae02
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/134570
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index 54e48e9..829171d 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -26,20 +26,20 @@
uint16_t cid;
};
-const CMap* FindNextCMap(const CMap* pMap) {
- return pMap->use_offset_ ? UNSAFE_TODO(pMap + pMap->use_offset_) : nullptr;
+const CMap* FindNextCMap(const CMap* cmap) {
+ return cmap->use_offset_ ? UNSAFE_TODO(cmap + cmap->use_offset_) : nullptr;
}
} // namespace
-uint16_t CIDFromCharCode(const CMap* pMap, uint32_t charcode) {
- DCHECK(pMap);
+uint16_t CIDFromCharCode(const CMap* cmap, uint32_t charcode) {
+ DCHECK(cmap);
const uint16_t loword = static_cast<uint16_t>(charcode);
if (charcode >> 16) {
- while (pMap) {
- if (pMap->dword_map_) {
- const DWordCIDMap* begin = pMap->dword_map_;
- const auto* end = UNSAFE_TODO(begin + pMap->dword_count_);
+ while (cmap) {
+ if (cmap->dword_map_) {
+ const DWordCIDMap* begin = cmap->dword_map_;
+ const auto* end = UNSAFE_TODO(begin + cmap->dword_count_);
const auto* found = std::lower_bound(
begin, end, charcode,
[](const DWordCIDMap& element, uint32_t charcode) {
@@ -54,17 +54,17 @@
return found->cid_ + loword - found->lo_word_low_;
}
}
- pMap = FindNextCMap(pMap);
+ cmap = FindNextCMap(cmap);
}
return 0;
}
- while (pMap && pMap->word_map_) {
- switch (pMap->word_map_type_) {
+ while (cmap && cmap->word_map_) {
+ switch (cmap->word_map_type_) {
case CMap::Type::kSingle: {
const auto* begin =
- reinterpret_cast<const SingleCmap*>(pMap->word_map_);
- const auto* end = UNSAFE_TODO(begin + pMap->word_count_);
+ reinterpret_cast<const SingleCmap*>(cmap->word_map_);
+ const auto* end = UNSAFE_TODO(begin + cmap->word_count_);
const auto* found = std::lower_bound(
begin, end, loword, [](const SingleCmap& element, uint16_t code) {
return element.code < code;
@@ -75,8 +75,8 @@
break;
}
case CMap::Type::kRange: {
- const auto* begin = reinterpret_cast<const RangeCmap*>(pMap->word_map_);
- const auto* end = UNSAFE_TODO(begin + pMap->word_count_);
+ const auto* begin = reinterpret_cast<const RangeCmap*>(cmap->word_map_);
+ const auto* end = UNSAFE_TODO(begin + cmap->word_count_);
const auto* found = std::lower_bound(
begin, end, loword, [](const RangeCmap& element, uint16_t code) {
return element.high < code;
@@ -87,25 +87,25 @@
break;
}
}
- pMap = FindNextCMap(pMap);
+ cmap = FindNextCMap(cmap);
}
return 0;
}
-uint32_t CharCodeFromCID(const CMap* pMap, uint16_t cid) {
- // TODO(dsinclair): This should be checking both pMap->word_map_ and
- // pMap->dword_map_. There was a second while() but it was never reached as
+uint32_t CharCodeFromCID(const CMap* cmap, uint16_t cid) {
+ // TODO(dsinclair): This should be checking both cmap->word_map_ and
+ // cmap->dword_map_. There was a second while() but it was never reached as
// the first always returns. Investigate and determine how this should
// really be working. (https://codereview.chromium.org/2235743003 removed the
// second while loop.)
- DCHECK(pMap);
- while (pMap) {
- switch (pMap->word_map_type_) {
+ DCHECK(cmap);
+ while (cmap) {
+ switch (cmap->word_map_type_) {
case CMap::Type::kSingle: {
auto single_span = UNSAFE_TODO(
- pdfium::span(reinterpret_cast<const SingleCmap*>(pMap->word_map_),
- pMap->word_count_));
+ pdfium::span(reinterpret_cast<const SingleCmap*>(cmap->word_map_),
+ cmap->word_count_));
for (const auto& single : single_span) {
if (single.cid == cid) {
return single.code;
@@ -115,8 +115,8 @@
}
case CMap::Type::kRange: {
auto range_span = UNSAFE_TODO(
- pdfium::span(reinterpret_cast<const RangeCmap*>(pMap->word_map_),
- pMap->word_count_));
+ pdfium::span(reinterpret_cast<const RangeCmap*>(cmap->word_map_),
+ cmap->word_count_));
for (const auto& range : range_span) {
if (cid >= range.cid && cid <= range.cid + range.high - range.low) {
return range.low + cid - range.cid;
@@ -125,7 +125,7 @@
break;
}
}
- pMap = FindNextCMap(pMap);
+ cmap = FindNextCMap(cmap);
}
return 0;
}
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.h b/core/fpdfapi/cmaps/fpdf_cmaps.h
index 87ad849..6c92cc4 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.h
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.h
@@ -32,8 +32,8 @@
int8_t use_offset_;
};
-uint16_t CIDFromCharCode(const CMap* pMap, uint32_t charcode);
-uint32_t CharCodeFromCID(const CMap* pMap, uint16_t cid);
+uint16_t CIDFromCharCode(const CMap* cmap, uint32_t charcode);
+uint32_t CharCodeFromCID(const CMap* cmap, uint16_t cid);
} // namespace fxcmap
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index f7f9619..4c45785 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -512,15 +512,15 @@
LoadSubstFont();
}
- RetainPtr<const CPDF_Object> pmap =
+ RetainPtr<const CPDF_Object> cmap =
pCIDFontDict->GetDirectObjectFor("CIDToGIDMap");
- if (pmap) {
- RetainPtr<const CPDF_Stream> pMapStream(pmap->AsStream());
- if (pMapStream) {
- stream_acc_ = pdfium::MakeRetain<CPDF_StreamAcc>(std::move(pMapStream));
+ if (cmap) {
+ RetainPtr<const CPDF_Stream> cmap_stream(cmap->AsStream());
+ if (cmap_stream) {
+ stream_acc_ = pdfium::MakeRetain<CPDF_StreamAcc>(std::move(cmap_stream));
stream_acc_->LoadAllDataFiltered();
- } else if (font_file_ && pmap->IsName() &&
- pmap->GetString() == "Identity") {
+ } else if (font_file_ && cmap->IsName() &&
+ cmap->GetString() == "Identity") {
cid_is_gid_ = true;
}
}
diff --git a/core/fpdfapi/render/cpdf_type3glyphmap.cpp b/core/fpdfapi/render/cpdf_type3glyphmap.cpp
index 7fcacd0..094c1a4 100644
--- a/core/fpdfapi/render/cpdf_type3glyphmap.cpp
+++ b/core/fpdfapi/render/cpdf_type3glyphmap.cpp
@@ -56,6 +56,6 @@
}
void CPDF_Type3GlyphMap::SetBitmap(uint32_t charcode,
- std::unique_ptr<CFX_GlyphBitmap> pMap) {
- glyph_map_[charcode] = std::move(pMap);
+ std::unique_ptr<CFX_GlyphBitmap> bitmap) {
+ glyph_map_[charcode] = std::move(bitmap);
}
diff --git a/core/fpdfapi/render/cpdf_type3glyphmap.h b/core/fpdfapi/render/cpdf_type3glyphmap.h
index 35dfcf5..65e0845 100644
--- a/core/fpdfapi/render/cpdf_type3glyphmap.h
+++ b/core/fpdfapi/render/cpdf_type3glyphmap.h
@@ -25,7 +25,7 @@
std::pair<int, int> AdjustBlue(float top, float bottom);
const CFX_GlyphBitmap* GetBitmap(uint32_t charcode) const;
- void SetBitmap(uint32_t charcode, std::unique_ptr<CFX_GlyphBitmap> pMap);
+ void SetBitmap(uint32_t charcode, std::unique_ptr<CFX_GlyphBitmap> bitmap);
private:
std::vector<int> top_blue_;
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 1051c9f..ce56b2f 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -110,13 +110,13 @@
}
wch = wFind & 0x0FFF;
wFind >>= 12;
- auto pMap = kUnicodeDataNormalizationMaps[wFind - 2].subspan(
+ auto maps = kUnicodeDataNormalizationMaps[wFind - 2].subspan(
static_cast<size_t>(wch));
if (wFind == 4) {
- wFind = pMap.front();
- pMap = pMap.subspan<1u>();
+ wFind = maps.front();
+ maps = maps.subspan<1u>();
}
- const auto range = pMap.first(static_cast<size_t>(wFind));
+ const auto range = maps.first(static_cast<size_t>(wFind));
return DataVector<wchar_t>(range.begin(), range.end());
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 1b7bd67..f6de6cc 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -584,14 +584,14 @@
return rgNodeArray;
}
-NodeSetPair* NodeSetPairForNode(CXFA_Node* pNode, NodeSetPairMapMap* pMap) {
+NodeSetPair* NodeSetPairForNode(CXFA_Node* pNode, NodeSetPairMapMap* map) {
CXFA_Node* pParentNode = pNode->GetParent();
uint32_t dwNameHash = pNode->GetNameHash();
if (!pParentNode || !dwNameHash) {
return nullptr;
}
- return &((*pMap)[pParentNode][dwNameHash]);
+ return &((*map)[pParentNode][dwNameHash]);
}
void ReorderDataNodes(const NodeSet& sSet1,
