diff options
author | Lei Zhang <thestig@chromium.org> | 2018-10-15 18:49:42 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-15 18:49:42 +0000 |
commit | 98ac76ec09ce72526134ad75f1921a1691804dd1 (patch) | |
tree | ed95e75069dc4a5477ab1f1d5393f72dc02a29c9 /core/fpdfapi/cmaps/CNS1 | |
parent | 21ce4ff1b684d3ca42217485737b26f4af21634b (diff) | |
download | pdfium-98ac76ec09ce72526134ad75f1921a1691804dd1.tar.xz |
Move CPDF_ModuleMgr methods into cpdf_modulemgr.cpp.
Some of them were implemented in core/fpdfapi/cmaps. Reorder
CPDF_ModuleMgr private methods as well.
Change-Id: I88b7c48049de83591c961dd9a74e01fefb211c0c
Reviewed-on: https://pdfium-review.googlesource.com/c/43991
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/cmaps/CNS1')
-rw-r--r-- | core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp | 14 | ||||
-rw-r--r-- | core/fpdfapi/cmaps/CNS1/cmaps_cns1.h | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp index 1291fa1c40..80c31d6293 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp @@ -6,12 +6,7 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -#include "core/fpdfapi/cmaps/cmap_int.h" -#include "core/fpdfapi/cpdf_modulemgr.h" -#include "core/fpdfapi/font/cpdf_fontglobals.h" -#include "core/fpdfapi/page/cpdf_pagemodule.h" - -static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { +const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { {"B5pc-H", g_FXCMAP_B5pc_H_0, nullptr, 247, 0, FXCMAP_CMap::Range, 0}, {"B5pc-V", g_FXCMAP_B5pc_V_0, nullptr, 12, 0, FXCMAP_CMap::Range, -1}, {"HKscs-B5-H", g_FXCMAP_HKscs_B5_H_5, nullptr, 1210, 0, FXCMAP_CMap::Range, @@ -38,9 +33,4 @@ static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { FXCMAP_CMap::Range, -1}, }; -void CPDF_ModuleMgr::LoadEmbeddedCNS1CMaps() { - CPDF_FontGlobals* pFontGlobals = - CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); - pFontGlobals->SetEmbeddedCharset(CIDSET_CNS1, g_FXCMAP_CNS1_cmaps); - pFontGlobals->SetEmbeddedToUnicode(CIDSET_CNS1, g_FXCMAP_CNS1CID2Unicode_5); -} +const size_t g_FXCMAP_CNS1_cmaps_size = FX_ArraySize(g_FXCMAP_CNS1_cmaps); diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h index 483fd66fc2..5868ed7241 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_ #define CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_ -#include <stdint.h> - #include "core/fpdfapi/cmaps/cmap_int.h" extern const uint16_t g_FXCMAP_B5pc_H_0[]; @@ -27,5 +25,7 @@ extern const uint16_t g_FXCMAP_UniCNS_UCS2_H_3[]; extern const uint16_t g_FXCMAP_UniCNS_UCS2_V_3[]; extern const uint16_t g_FXCMAP_UniCNS_UTF16_H_0[]; extern const uint16_t g_FXCMAP_CNS1CID2Unicode_5[19088]; +extern const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[]; +extern const size_t g_FXCMAP_CNS1_cmaps_size; #endif // CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_ |