From c4dce690f433a41c4429e872c2306e09b14c5d9f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jun 2018 19:48:59 +0000 Subject: 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 Commit-Queue: Tom Sepez --- core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp | 5 ++--- core/fpdfapi/cmaps/Korea1/cmaps_korea1.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi/cmaps/Korea1') diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp index daec8259e9..4c9201269c 100644 --- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp +++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp @@ -37,8 +37,7 @@ static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = { void CPDF_ModuleMgr::LoadEmbeddedKorea1CMaps() { CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); - pFontGlobals->SetEmbeddedCharset(CIDSET_KOREA1, g_FXCMAP_Korea1_cmaps, - FX_ArraySize(g_FXCMAP_Korea1_cmaps)); + pFontGlobals->SetEmbeddedCharset(CIDSET_KOREA1, g_FXCMAP_Korea1_cmaps); pFontGlobals->SetEmbeddedToUnicode(CIDSET_KOREA1, - g_FXCMAP_Korea1CID2Unicode_2, 18352); + g_FXCMAP_Korea1CID2Unicode_2); } diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h index 5005ff2dea..27b9b0b7c4 100644 --- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h +++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h @@ -19,6 +19,6 @@ extern const uint16_t g_FXCMAP_KSCpc_EUC_H_0[]; extern const uint16_t g_FXCMAP_UniKS_UCS2_H_1[]; extern const uint16_t g_FXCMAP_UniKS_UCS2_V_1[]; extern const uint16_t g_FXCMAP_UniKS_UTF16_H_0[]; -extern const uint16_t g_FXCMAP_Korea1CID2Unicode_2[]; +extern const uint16_t g_FXCMAP_Korea1CID2Unicode_2[18352]; #endif // CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_ -- cgit v1.2.3