diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-06-26 19:48:59 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-26 19:48:59 +0000 |
commit | c4dce690f433a41c4429e872c2306e09b14c5d9f (patch) | |
tree | 43990b61718628e7731fb8b6bf7c12e4df04b8ff /core/fpdfapi/cmaps/CNS1 | |
parent | ca386ad150be28116997b713056a4a2197c7b7e8 (diff) | |
download | pdfium-c4dce690f433a41c4429e872c2306e09b14c5d9f.tar.xz |
Use pdfium::span<> in cpdf_fontglobals.h
Required moving some sizes to .h file for default construction
of spans from c-style arrays.
Change-Id: I45c42103f3575bc83e57a085ad4e8f16698468d3
Reviewed-on: https://pdfium-review.googlesource.com/36190
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/cmaps/CNS1')
-rw-r--r-- | core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp | 6 | ||||
-rw-r--r-- | core/fpdfapi/cmaps/CNS1/cmaps_cns1.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp index 5076fcdd88..1291fa1c40 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp @@ -41,8 +41,6 @@ static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { void CPDF_ModuleMgr::LoadEmbeddedCNS1CMaps() { CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); - pFontGlobals->SetEmbeddedCharset(CIDSET_CNS1, g_FXCMAP_CNS1_cmaps, - FX_ArraySize(g_FXCMAP_CNS1_cmaps)); - pFontGlobals->SetEmbeddedToUnicode(CIDSET_CNS1, g_FXCMAP_CNS1CID2Unicode_5, - 19088); + pFontGlobals->SetEmbeddedCharset(CIDSET_CNS1, g_FXCMAP_CNS1_cmaps); + pFontGlobals->SetEmbeddedToUnicode(CIDSET_CNS1, g_FXCMAP_CNS1CID2Unicode_5); } diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h index 627feb7bed..483fd66fc2 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h @@ -26,6 +26,6 @@ extern const FXCMAP_DWordCIDMap g_FXCMAP_CNS_EUC_V_0_DWord[]; 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[]; +extern const uint16_t g_FXCMAP_CNS1CID2Unicode_5[19088]; #endif // CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_ |