summaryrefslogtreecommitdiff
path: root/core/fpdfapi/cmaps/Japan1
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-26 19:48:59 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-26 19:48:59 +0000
commitc4dce690f433a41c4429e872c2306e09b14c5d9f (patch)
tree43990b61718628e7731fb8b6bf7c12e4df04b8ff /core/fpdfapi/cmaps/Japan1
parentca386ad150be28116997b713056a4a2197c7b7e8 (diff)
downloadpdfium-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/Japan1')
-rw-r--r--core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp5
-rw-r--r--core/fpdfapi/cmaps/Japan1/cmaps_japan1.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index f640fdd597..ecc2b3fd3b 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -53,8 +53,7 @@ static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() {
CPDF_FontGlobals* pFontGlobals =
CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
- pFontGlobals->SetEmbeddedCharset(CIDSET_JAPAN1, g_FXCMAP_Japan1_cmaps,
- FX_ArraySize(g_FXCMAP_Japan1_cmaps));
+ pFontGlobals->SetEmbeddedCharset(CIDSET_JAPAN1, g_FXCMAP_Japan1_cmaps);
pFontGlobals->SetEmbeddedToUnicode(CIDSET_JAPAN1,
- g_FXCMAP_Japan1CID2Unicode_4, 15444);
+ g_FXCMAP_Japan1CID2Unicode_4);
}
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
index 27777f2dec..0979d2a40d 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
@@ -30,6 +30,6 @@ extern const uint16_t g_FXCMAP_UniJIS_UCS2_HW_V_4[];
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[];
+extern const uint16_t g_FXCMAP_Japan1CID2Unicode_4[15444];
#endif // CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_