commit 9214491d9e93d6fd66ab2b6ebb2b9384b04e33fe
author Lei Zhang <thestig@chromium.org> Tue Mar 22 19:31:41 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 22 19:31:41 2022 +0000
tree b98443d05a913024de189ebf0d0835ac5c68f9f7
parent 69dc21c1e17c55e527f6778ebd316eaf68712a16

Make CPDF_BAFontMap::EncodeFontAlias() a standalone function.

It does not need to be part of CPDF_BAFontMap.

Change-Id: I7aeffd4194122a051297a41d4cef04c736f60018
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/91711
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfdoc/cpdf_bafontmap.cpp

diff --git a/core/fpdfdoc/cpdf_bafontmap.cpp b/core/fpdfdoc/cpdf_bafontmap.cpp
index 9813a75..fed8210 100644
--- a/core/fpdfdoc/cpdf_bafontmap.cpp
+++ b/core/fpdfdoc/cpdf_bafontmap.cpp
@@ -54,6 +54,12 @@
   return pDocPageData->AddFont(std::move(pFXFont), nCharset);
 }
 
+ByteString EncodeFontAlias(ByteString sFontName, FX_Charset nCharset) {
+  sFontName.Remove(' ');
+  sFontName += ByteString::Format("_%02X", nCharset);
+  return sFontName;
+}
+
 }  // namespace
 
 CPDF_BAFontMap::Data::Data() = default;
@@ -331,9 +337,8 @@
   RetainPtr<CPDF_Font> pFont =
       bFind ? FindFontSameCharset(&sAlias, nCharset) : nullptr;
   if (!pFont) {
-    ByteString sTemp = sFontName;
-    pFont = AddFontToDocument(sTemp, nCharset);
-    sAlias = EncodeFontAlias(sTemp, nCharset);
+    pFont = AddFontToDocument(sFontName, nCharset);
+    sAlias = EncodeFontAlias(sFontName, nCharset);
   }
   AddFontToAnnotDict(pFont, sAlias);
   return AddFontData(pFont, sAlias, nCharset);
@@ -350,14 +355,6 @@
   return fxcrt::CollectionSize<int32_t>(m_Data) - 1;
 }
 
-ByteString CPDF_BAFontMap::EncodeFontAlias(const ByteString& sFontName,
-                                           FX_Charset nCharset) {
-  ByteString sRet = sFontName;
-  sRet.Remove(' ');
-  sRet += ByteString::Format("_%02X", nCharset);
-  return sRet;
-}
-
 int32_t CPDF_BAFontMap::FindFont(const ByteString& sFontName,
                                  FX_Charset nCharset) {
   int32_t i = 0;

core/fpdfdoc/cpdf_bafontmap.h

diff --git a/core/fpdfdoc/cpdf_bafontmap.h b/core/fpdfdoc/cpdf_bafontmap.h
index ea85be0..95a8ff3 100644
--- a/core/fpdfdoc/cpdf_bafontmap.h
+++ b/core/fpdfdoc/cpdf_bafontmap.h
@@ -69,8 +69,6 @@
                       const ByteString& sFontAlias,
                       FX_Charset nCharset);
 
-  ByteString EncodeFontAlias(const ByteString& sFontName, FX_Charset nCharset);
-
   int32_t FindFont(const ByteString& sFontName, FX_Charset nCharset);
   ByteString GetNativeFontName(FX_Charset nCharset);
   ByteString GetCachedNativeFontName(FX_Charset nCharset);