Change CPDF_Font::GetNextChar()'s in-out parameter to pass by pointer.chromium/3518

Instead of passing by non-const reference. Adjust the override in
CPDF_CIDFont and CPDF_CMap::GetNextChar() as well.

Change-Id: I0ee6dc21077101cbeeb0e334498075fc463a2d65
Reviewed-on: https://pdfium-review.googlesource.com/39492
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index a243ceb334..f75f696035 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -275,7 +275,7 @@ uint32_t CPDF_Font::GetStringWidth(const ByteStringView& pString) {
   size_t offset = 0;
   uint32_t width = 0;
   while (offset < pString.GetLength())
-    width += GetCharWidthF(GetNextChar(pString, offset));
+    width += GetCharWidthF(GetNextChar(pString, &offset));
   return width;
 }
 
@@ -330,13 +330,13 @@ std::unique_ptr<CPDF_Font> CPDF_Font::Create(CPDF_Document* pDoc,
 }
 
 uint32_t CPDF_Font::GetNextChar(const ByteStringView& pString,
-                                size_t& offset) const {
+                                size_t* pOffset) const {
   if (pString.IsEmpty())
     return 0;
 
-  uint8_t ch = offset < pString.GetLength() ? pString[offset++]
-                                            : pString[pString.GetLength() - 1];
-  return static_cast<uint32_t>(ch);
+  size_t& offset = *pOffset;
+  return offset < pString.GetLength() ? pString[offset++]
+                                      : pString[pString.GetLength() - 1];
 }
 
 bool CPDF_Font::IsStandardFont() const {