From eca866c64ec0319d4723798290a3155957fa733e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 14 Oct 2015 13:54:22 -0700 Subject: Next round of master changes to match XFA R=thestig@chromium.org Review URL: https://codereview.chromium.org/1401423004 . --- fpdfsdk/src/fpdfview.cpp | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'fpdfsdk/src/fpdfview.cpp') diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index dfa91d1243..84dabe6864 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -64,30 +64,6 @@ FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy) { CCodec_ModuleMgr* g_pCodecModule = nullptr; -#if _FX_OS_ == _FX_LINUX_EMBEDDED_ -class CFontMapper : public IPDF_FontMapper { - public: - CFontMapper(); - ~CFontMapper() override; - - // IPDF_FontMapper - FT_Face FindSubstFont( - CPDF_Document* pDoc, // [IN] The PDF document - const CFX_ByteString& face_name, // [IN] Original name - FX_BOOL bTrueType, // [IN] TrueType or Type1 - FX_DWORD flags, // [IN] PDF font flags (see PDF Reference section 5.7.1) - int font_weight, // [IN] original font weight. 0 for not specified - int CharsetCP, // [IN] code page for charset (see Win32 GetACP()) - FX_BOOL bVertical, - CPDF_SubstFont* pSubstFont // [OUT] Subst font data - ) override; - - FT_Face m_SysFace; -}; - -CFontMapper* g_pFontMapper = NULL; -#endif // #if _FX_OS_ == _FX_LINUX_EMBEDDED_ - DLLEXPORT void STDCALL FPDF_InitLibrary() { FPDF_InitLibraryWithConfig(nullptr); } @@ -115,10 +91,6 @@ DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig( } DLLEXPORT void STDCALL FPDF_DestroyLibrary() { -#if _FX_OS_ == _FX_LINUX_EMBEDDED_ - delete g_pFontMapper; - g_pFontMapper = nullptr; -#endif CPDF_ModuleMgr::Destroy(); CFX_GEModule::Destroy(); @@ -203,7 +175,7 @@ class CMemFile final : public IFX_FileRead { } private: - ~CMemFile() {} + ~CMemFile() override {} uint8_t* m_pBuf; FX_FILESIZE m_size; -- cgit v1.2.3