diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 13:25:44 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 13:25:44 -0700 |
commit | c3f4894a6862c74b9ab32b4ec38c531de6ecd83c (patch) | |
tree | f5ad333e8d418d5a978a595f51e94b3ad8f365da /core/src/fxge/ge/fx_ge_fontmap.cpp | |
parent | 71c15a5e6652952a94ba3a3ef7ac0392e3a06962 (diff) | |
download | pdfium-c3f4894a6862c74b9ab32b4ec38c531de6ecd83c.tar.xz |
Extern in .cpp file is a code smell, part 2.
Fixes the remaining issues, except for JBIG2/Skia ...
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1298393003 .
Diffstat (limited to 'core/src/fxge/ge/fx_ge_fontmap.cpp')
-rw-r--r-- | core/src/fxge/ge/fx_ge_fontmap.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index 15f7bc34d0..561b7d9b66 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -409,11 +409,6 @@ const FoxitFonts g_FoxitFonts[14] = { {g_FoxitSymbolFontData, 16729}, {g_FoxitDingbatsFontData, 29513}, }; -void _FPDFAPI_GetInternalFontData(int id, - const uint8_t*& data, - FX_DWORD& size) { - CFX_GEModule::Get()->GetFontMgr()->GetStandardFont(data, size, id); -} FX_BOOL CFX_FontMgr::GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index) { @@ -481,8 +476,7 @@ static CFX_ByteString _TT_NormalizeName(const FX_CHAR* family) { norm.MakeLower(); return norm; } -CFX_ByteString _FPDF_GetNameFromTT(const uint8_t* name_table, - FX_DWORD name_id) { +CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name_id) { const uint8_t* ptr = name_table + 2; int name_count = GET_TT_SHORT(ptr); int string_offset = GET_TT_SHORT(ptr + 2); @@ -550,7 +544,7 @@ CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) { if (size) { uint8_t* buffer = FX_Alloc(uint8_t, size); m_pFontInfo->GetFontData(hFont, 0x6e616d65, buffer, size); - result = _FPDF_GetNameFromTT(buffer, 6); + result = GetNameFromTT(buffer, 6); FX_Free(buffer); } return result; @@ -1249,10 +1243,6 @@ CFontFileFaceInfo::~CFontFileFaceInfo() { } m_Face = NULL; } -extern FX_BOOL _LoadFile(FXFT_Library library, - FXFT_Face* Face, - IFX_FileRead* pFile, - FXFT_Stream* stream); #if _FX_OS_ == _FX_ANDROID_ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { return NULL; @@ -1366,8 +1356,8 @@ void CFX_FolderFontInfo::ReportFace(CFX_ByteString& path, } CFX_ByteString names = _FPDF_LoadTableFromTT(pFile, tables, nTables, 0x6e616d65); - CFX_ByteString facename = _FPDF_GetNameFromTT(names, 1); - CFX_ByteString style = _FPDF_GetNameFromTT(names, 2); + CFX_ByteString facename = GetNameFromTT(names, 1); + CFX_ByteString style = GetNameFromTT(names, 2); if (style != "Regular") { facename += " " + style; } |