Merge to XFA: Declare PDF_GetStandardFontName() in the header.

core/src/fxge/ge/fx_ge_fontmap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <limits>
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 161 matching lines @@
     "Helvetica-Bold",
     "Helvetica-BoldOblique",
     "Helvetica-Oblique",
     "Times-Roman",
     "Times-Bold",
     "Times-BoldItalic",
     "Times-Italic",
     "Symbol",
     "ZapfDingbats",
 };
-const struct _AltFontName {
+const struct AltFontName {
   const FX_CHAR* m_pName;
   int m_Index;
 } g_AltFontNames[] = {
     {"Arial", 4},
     {"Arial,Bold", 5},
     {"Arial,BoldItalic", 6},
     {"Arial,Italic", 7},
     {"Arial-Bold", 5},
     {"Arial-BoldItalic", 6},
     {"Arial-BoldItalicMT", 6},
@@ skipping 75 matching lines @@
     {"TimesNewRomanPS-Italic", 11},
     {"TimesNewRomanPS-ItalicMT", 11},
     {"TimesNewRomanPSMT", 8},
     {"TimesNewRomanPSMT,Bold", 9},
     {"TimesNewRomanPSMT,BoldItalic", 10},
     {"TimesNewRomanPSMT,Italic", 11},
     {"ZapfDingbats", 13},
 };
 extern "C" {
 static int compareString(const void* key, const void* element) {
-  return FXSYS_stricmp((const FX_CHAR*)key, ((_AltFontName*)element)->m_pName);
+  return FXSYS_stricmp((const FX_CHAR*)key, ((AltFontName*)element)->m_pName);
 }
 }
-int _PDF_GetStandardFontName(CFX_ByteString& name) {
-  _AltFontName* found =
-      (_AltFontName*)FXSYS_bsearch(name.c_str(), g_AltFontNames,
-                                   sizeof g_AltFontNames / sizeof(_AltFontName),
-                                   sizeof(_AltFontName), compareString);
-  if (found == NULL) {
-    return -1;
-  }
-  name = g_Base14FontNames[found->m_Index];
-  return found->m_Index;
-}
+
 int GetTTCIndex(const uint8_t* pFontData,
                 FX_DWORD ttc_size,
                 FX_DWORD font_offset) {
   int face_index = 0;
   const uint8_t* p = pFontData + 8;
   FX_DWORD nfont = GET_TT_LONG(p);
   FX_DWORD index;
   for (index = 0; index < nfont; index++) {
     p = pFontData + 12 + index * 4;
     if (GET_TT_LONG(p) == font_offset) {
@@ skipping 545 matching lines @@
     weight = FXFONT_FW_NORMAL;
     italic_angle = 0;
   }
   CFX_ByteString SubstName = name;
   SubstName.Remove(0x20);
   if (bTrueType) {
     if (name[0] == '@') {
       SubstName = name.Mid(1);
     }
   }
-  _PDF_GetStandardFontName(SubstName);
+  PDF_GetStandardFontName(&SubstName);
   if (SubstName == FX_BSTRC("Symbol") && !bTrueType) {
     pSubstFont->m_Family = "Chrome Symbol";
     pSubstFont->m_Charset = FXFONT_SYMBOL_CHARSET;
     pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
     if (m_FoxitFaces[12]) {
       return m_FoxitFaces[12];
     }
     const uint8_t* pFontData = NULL;
     FX_DWORD size = 0;
     m_pFontMgr->GetStandardFont(pFontData, size, 12);
@@ skipping 13 matching lines @@
     m_FoxitFaces[13] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
     return m_FoxitFaces[13];
   }
   int iBaseFont = 0;
   CFX_ByteString family, style;
   FX_BOOL bHasComma = FALSE;
   FX_BOOL bHasHypen = FALSE;
   int find = SubstName.Find(FX_BSTRC(","), 0);
   if (find >= 0) {
     family = SubstName.Left(find);
-    _PDF_GetStandardFontName(family);
+    PDF_GetStandardFontName(&family);
     style = SubstName.Mid(find + 1);
     bHasComma = TRUE;
   } else {
     family = SubstName;
   }
   for (; iBaseFont < 12; iBaseFont++)
     if (family == CFX_ByteStringC(g_Base14FontNames[iBaseFont])) {
       break;
     }
   int PitchFamily = 0;
@@ skipping 760 matching lines @@
   if (hFont == NULL) {
     return FALSE;
   }
   CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
   name = pFont->m_FaceName;
   return TRUE;
 }
 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
   return FALSE;
 }
+
+int PDF_GetStandardFontName(CFX_ByteString* name) {
+  AltFontName* found = static_cast<AltFontName*>(
+      FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
+                    sizeof(AltFontName), compareString));
+  if (!found)
+    return -1;
+
+  *name = g_Base14FontNames[found->m_Index];
+  return found->m_Index;
+}