commit 6444d28bb4e9ee9f9f10cb32ab7abbb5e5905900
author Lei Zhang <thestig@chromium.org> Fri Apr 01 21:51:26 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 01 21:51:26 2022 +0000
tree a44e9ce9ce534e3e5d0f00c43742e3a48e511ce4
parent 11824a5cffee5e939829623eaa2c178b8c9f1723

Rename FT_CharCodeFromUnicode() to not look like a Freetype function.

Rename it to CharCodeFromUnicodeForFreetypeEncoding() so the name
describes what it does, without implying it is a Freetype function.

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

core/fpdfapi/font/cpdf_cidfont.cpp

diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index b881ec3..203f01a 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -734,8 +734,8 @@
         index = FT_Get_Char_Index(face, name_unicode);
       } else {
         DCHECK_EQ(base_encoding, FontEncoding::kMacRoman);
-        uint32_t maccode =
-            FT_CharCodeFromUnicode(FT_ENCODING_APPLE_ROMAN, name_unicode);
+        uint32_t maccode = CharCodeFromUnicodeForFreetypeEncoding(
+            FT_ENCODING_APPLE_ROMAN, name_unicode);
         index = maccode ? FT_Get_Char_Index(face, maccode)
                         : FT_Get_Name_Index(face, name);
       }
@@ -759,9 +759,9 @@
     if (err) {
       int i;
       for (i = 0; i < face->num_charmaps; i++) {
-        uint32_t ret =
-            FT_CharCodeFromUnicode(FXFT_Get_Charmap_Encoding(face->charmaps[i]),
-                                   static_cast<wchar_t>(charcode));
+        uint32_t ret = CharCodeFromUnicodeForFreetypeEncoding(
+            FXFT_Get_Charmap_Encoding(face->charmaps[i]),
+            static_cast<wchar_t>(charcode));
         if (ret == 0)
           continue;
         FT_Set_Charmap(face, face->charmaps[i]);

core/fpdfapi/font/cpdf_fontencoding.cpp

diff --git a/core/fpdfapi/font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp
index c1ee630..1d954d8 100644
--- a/core/fpdfapi/font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/font/cpdf_fontencoding.cpp
@@ -1731,7 +1731,7 @@
   return pDict;
 }
 
-uint32_t FT_CharCodeFromUnicode(int encoding, wchar_t unicode) {
+uint32_t CharCodeFromUnicodeForFreetypeEncoding(int encoding, wchar_t unicode) {
   switch (encoding) {
     case FT_ENCODING_UNICODE:
       return unicode;

core/fpdfapi/font/cpdf_fontencoding.h

diff --git a/core/fpdfapi/font/cpdf_fontencoding.h b/core/fpdfapi/font/cpdf_fontencoding.h
index bad7f1d..3e7f64a 100644
--- a/core/fpdfapi/font/cpdf_fontencoding.h
+++ b/core/fpdfapi/font/cpdf_fontencoding.h
@@ -24,7 +24,7 @@
   kMsSymbol = 8,
 };
 
-uint32_t FT_CharCodeFromUnicode(int encoding, wchar_t unicode);
+uint32_t CharCodeFromUnicodeForFreetypeEncoding(int encoding, wchar_t unicode);
 wchar_t UnicodeFromAppleRomanCharCode(uint8_t charcode);
 
 const uint16_t* PDF_UnicodesForPredefinedCharSet(FontEncoding encoding);

core/fpdfapi/font/cpdf_truetypefont.cpp

diff --git a/core/fpdfapi/font/cpdf_truetypefont.cpp b/core/fpdfapi/font/cpdf_truetypefont.cpp
index 3ec388c..d927913 100644
--- a/core/fpdfapi/font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
@@ -86,9 +86,9 @@
           m_GlyphIndex[charcode] =
               FT_Get_Char_Index(face, m_Encoding.UnicodeFromCharCode(charcode));
         } else if (charmap_type == CharmapType::kMacRoman) {
-          uint32_t maccode =
-              FT_CharCodeFromUnicode(FT_ENCODING_APPLE_ROMAN,
-                                     m_Encoding.UnicodeFromCharCode(charcode));
+          uint32_t maccode = CharCodeFromUnicodeForFreetypeEncoding(
+              FT_ENCODING_APPLE_ROMAN,
+              m_Encoding.UnicodeFromCharCode(charcode));
           if (!maccode) {
             m_GlyphIndex[charcode] = FT_Get_Name_Index(face, name);
           } else {