diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-25 14:54:12 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-25 14:54:12 -0800 |
| commit | 3caa6537663e85ad6874c4420907d2ab885c80ea (patch) | |
| tree | 0bb377fb6f8d20bcca0e3da0ed5ec07177a6cee9 /fpdfsdk/src/fpdfview.cpp | |
| parent | b210651db6a965ad50d726a4bb872580e93d2ae9 (diff) | |
| download | pdfium-3caa6537663e85ad6874c4420907d2ab885c80ea.tar.xz | |
master: more underlying types
Precursor to https://codereview.chromium.org/1477583002/
Also:
merge where possible.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1481523004 .
Diffstat (limited to 'fpdfsdk/src/fpdfview.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index fcb6731563..99a3d90246 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -100,16 +100,14 @@ DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig( CFX_GEModule::Get()->SetCodecModule(g_pCodecModule); CPDF_ModuleMgr::Create(); - CPDF_ModuleMgr::Get()->SetCodecModule(g_pCodecModule); - CPDF_ModuleMgr::Get()->InitPageModule(); - CPDF_ModuleMgr::Get()->InitRenderModule(); CPDF_ModuleMgr* pModuleMgr = CPDF_ModuleMgr::Get(); - if (pModuleMgr) { - pModuleMgr->LoadEmbeddedGB1CMaps(); - pModuleMgr->LoadEmbeddedJapan1CMaps(); - pModuleMgr->LoadEmbeddedCNS1CMaps(); - pModuleMgr->LoadEmbeddedKorea1CMaps(); - } + pModuleMgr->SetCodecModule(g_pCodecModule); + pModuleMgr->InitPageModule(); + pModuleMgr->InitRenderModule(); + pModuleMgr->LoadEmbeddedGB1CMaps(); + pModuleMgr->LoadEmbeddedJapan1CMaps(); + pModuleMgr->LoadEmbeddedCNS1CMaps(); + pModuleMgr->LoadEmbeddedKorea1CMaps(); if (cfg && cfg->version >= 2) IJS_Runtime::Initialize(cfg->m_v8EmbedderSlot, cfg->m_pIsolate); } |