summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-08-13 11:32:36 -0700
committerTom Sepez <tsepez@chromium.org>2015-08-13 11:32:36 -0700
commit98367f3ef7dc76c856db1c8a3721bef5f9b7adfc (patch)
treeb0f9533e42d1d2383bc3667db84095b53a971ac8 /fpdfsdk/src
parentd8b5e73d8609b74e6a995ee1768d20d47bd4b089 (diff)
downloadpdfium-98367f3ef7dc76c856db1c8a3721bef5f9b7adfc.tar.xz
Revert "Allow external font-path configuration from pdfium_test."
This reverts commit d8b5e73d8609b74e6a995ee1768d20d47bd4b089. Broke corpus tests TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1292153002 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fpdf_sysfontinfo.cpp2
-rw-r--r--fpdfsdk/src/fpdfview.cpp7
-rw-r--r--fpdfsdk/src/fpdfview_c_api_test.c1
3 files changed, 2 insertions, 8 deletions
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index 804efe3020..a0fdb5083d 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -168,7 +168,7 @@ static void DefaultDeleteFont(struct _FPDF_SYSFONTINFO* pThis, void* hFont) {
}
DLLEXPORT FPDF_SYSFONTINFO* STDCALL FPDF_GetDefaultSystemFontInfo() {
- IFX_SystemFontInfo* pFontInfo = IFX_SystemFontInfo::CreateDefault(nullptr);
+ IFX_SystemFontInfo* pFontInfo = IFX_SystemFontInfo::CreateDefault();
if (pFontInfo == NULL)
return NULL;
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 2700aebddc..9ad3384803 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -91,14 +91,9 @@ CFontMapper* g_pFontMapper = NULL;
#endif // #if _FX_OS_ == _FX_LINUX_EMBEDDED_
DLLEXPORT void STDCALL FPDF_InitLibrary() {
- FPDF_InitLibraryWithConfig(nullptr);
-}
-
-DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig(
- const FPDF_LIBRARY_CONFIG* cfg) {
g_pCodecModule = new CCodec_ModuleMgr();
- CFX_GEModule::Create(cfg ? cfg->m_pUserFontPaths : nullptr);
+ CFX_GEModule::Create();
CFX_GEModule::Get()->SetCodecModule(g_pCodecModule);
CPDF_ModuleMgr::Create();
diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c
index a17f7b6c1e..3fd682d394 100644
--- a/fpdfsdk/src/fpdfview_c_api_test.c
+++ b/fpdfsdk/src/fpdfview_c_api_test.c
@@ -172,7 +172,6 @@ int CheckPDFiumCApi() {
// fpdfview.h
CHK(FPDF_InitLibrary);
- CHK(FPDF_InitLibraryWithConfig);
CHK(FPDF_DestroyLibrary);
CHK(FPDF_SetSandBoxPolicy);
CHK(FPDF_LoadDocument);