Rename `CPDF_TextObject::char_pos_` Reanme it to `char_positions_` since it is plural. Change-Id: I414b0de0deb1a69ae3cdfd28feaf3a0cecc41b32 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/144850 Reviewed-by: Andy Phan <andyphan@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp index a9bf8a2..cf1a443 100644 --- a/core/fpdfapi/page/cpdf_textobject.cpp +++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -47,7 +47,7 @@ Item info; info.char_code_ = char_codes_[index]; - info.origin_ = CFX_PointF(index > 0 ? char_pos_[index - 1] : 0, 0); + info.origin_ = CFX_PointF(index > 0 ? char_positions_[index - 1] : 0, 0); if (info.char_code_ == CPDF_Font::kInvalidCharCode) { return info; } @@ -165,7 +165,7 @@ auto obj = std::make_unique<CPDF_TextObject>(); obj->CopyData(this); obj->char_codes_ = char_codes_; - obj->char_pos_ = char_pos_; + obj->char_positions_ = char_positions_; obj->pos_ = pos_; return obj; } @@ -212,7 +212,7 @@ size_t nSegs = strings.size(); CHECK(nSegs); char_codes_.clear(); - char_pos_.clear(); + char_positions_.clear(); RetainPtr<CPDF_Font> font = GetFont(); size_t nChars = nSegs - 1; for (const auto& str : strings) { @@ -220,7 +220,7 @@ } CHECK(nChars); char_codes_.resize(nChars); - char_pos_.resize(nChars - 1); + char_positions_.resize(nChars - 1); size_t index = 0; for (size_t i = 0; i < nSegs; ++i) { ByteStringView segment = strings[i].AsStringView(); @@ -230,7 +230,7 @@ char_codes_[index++] = font->GetNextChar(segment, &offset); } if (i != nSegs - 1) { - char_pos_[index - 1] = kernings[i]; + char_positions_[index - 1] = kernings[i]; char_codes_[index++] = CPDF_Font::kInvalidCharCode; } } @@ -295,10 +295,10 @@ const uint32_t charcode = char_codes_[i]; if (i > 0) { if (charcode == CPDF_Font::kInvalidCharCode) { - curpos -= (char_pos_[i - 1] * fontsize) / 1000; + curpos -= (char_positions_[i - 1] * fontsize) / 1000; continue; } - char_pos_[i - 1] = curpos; + char_positions_[i - 1] = curpos; } FX_RECT char_rect = font->GetCharBBox(charcode);
diff --git a/core/fpdfapi/page/cpdf_textobject.h b/core/fpdfapi/page/cpdf_textobject.h index 2415b76..fd44d71 100644 --- a/core/fpdfapi/page/cpdf_textobject.h +++ b/core/fpdfapi/page/cpdf_textobject.h
@@ -66,7 +66,7 @@ void SetPosition(const CFX_PointF& pos) { pos_ = pos; } const std::vector<uint32_t>& GetCharCodes() const { return char_codes_; } - const std::vector<float>& GetCharPositions() const { return char_pos_; } + const std::vector<float>& GetCharPositions() const { return char_positions_; } // Caller is expected to call SetDirty(true) when done changing the object. void SetTextMatrix(const CFX_Matrix& matrix); @@ -81,7 +81,7 @@ CFX_PointF pos_; std::vector<uint32_t> char_codes_; - std::vector<float> char_pos_; + std::vector<float> char_positions_; }; #endif // CORE_FPDFAPI_PAGE_CPDF_TEXTOBJECT_H_