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/Japan1 | |
| 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/Japan1')
| -rw-r--r-- | core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp | 15 | ||||
| -rw-r--r-- | core/fpdfapi/cmaps/Japan1/cmaps_japan1.h | 4 |
2 files changed, 5 insertions, 14 deletions
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp index ecc2b3fd3b..9b9cfc37a0 100644 --- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp +++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp @@ -6,12 +6,7 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.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_Japan1_cmaps[] = { +const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { {"83pv-RKSJ-H", g_FXCMAP_83pv_RKSJ_H_1, nullptr, 222, 0, FXCMAP_CMap::Range, 0}, {"90ms-RKSJ-H", g_FXCMAP_90ms_RKSJ_H_2, nullptr, 171, 0, FXCMAP_CMap::Range, @@ -50,10 +45,4 @@ static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { FXCMAP_CMap::Single, -1}, }; -void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() { - CPDF_FontGlobals* pFontGlobals = - CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); - pFontGlobals->SetEmbeddedCharset(CIDSET_JAPAN1, g_FXCMAP_Japan1_cmaps); - pFontGlobals->SetEmbeddedToUnicode(CIDSET_JAPAN1, - g_FXCMAP_Japan1CID2Unicode_4); -} +const size_t g_FXCMAP_Japan1_cmaps_size = FX_ArraySize(g_FXCMAP_Japan1_cmaps); diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h index 0979d2a40d..c98bb1581c 100644 --- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h +++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ #define CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ -#include <stdint.h> +#include "core/fpdfapi/cmaps/cmap_int.h" extern const uint16_t g_FXCMAP_83pv_RKSJ_H_1[]; extern const uint16_t g_FXCMAP_90ms_RKSJ_H_2[]; @@ -31,5 +31,7 @@ extern const uint16_t g_FXCMAP_UniJIS_UTF16_H_0[]; extern const uint16_t g_FXCMAP_UniJIS_UTF16_H_0_DWord[]; extern const uint16_t g_FXCMAP_UniJIS_UTF16_V_0[]; extern const uint16_t g_FXCMAP_Japan1CID2Unicode_4[15444]; +extern const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[]; +extern const size_t g_FXCMAP_Japan1_cmaps_size; #endif // CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ |