From c45271e053c8c458cefa4ccf847c85b7d1df3f09 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 5 Dec 2017 20:27:02 +0000 Subject: Remove redundant field in struct FXCMAP_CMap. Change-Id: Ibac6398b5849820562830bb8ed95c3428496f7ef Reviewed-on: https://pdfium-review.googlesource.com/20410 Reviewed-by: dsinclair Commit-Queue: Lei Zhang --- core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'core/fpdfapi/cmaps/GB1') diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp index 2c3974a3b0..f35161ab97 100644 --- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp +++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp @@ -12,34 +12,30 @@ #include "core/fpdfapi/page/cpdf_pagemodule.h" static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { - {"GB-EUC-H", g_FXCMAP_GB_EUC_H_0, nullptr, 90, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, 0}, - {"GB-EUC-V", g_FXCMAP_GB_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -1}, + {"GB-EUC-H", g_FXCMAP_GB_EUC_H_0, nullptr, 90, 0, FXCMAP_CMap::Range, 0}, + {"GB-EUC-V", g_FXCMAP_GB_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range, -1}, {"GBpc-EUC-H", g_FXCMAP_GBpc_EUC_H_0, nullptr, 91, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, 0}, + 0}, {"GBpc-EUC-V", g_FXCMAP_GBpc_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -1}, + -1}, {"GBK-EUC-H", g_FXCMAP_GBK_EUC_H_2, nullptr, 4071, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, 0}, - {"GBK-EUC-V", g_FXCMAP_GBK_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -1}, + 0}, + {"GBK-EUC-V", g_FXCMAP_GBK_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range, -1}, {"GBKp-EUC-H", g_FXCMAP_GBKp_EUC_H_2, nullptr, 4070, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -2}, + -2}, {"GBKp-EUC-V", g_FXCMAP_GBKp_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -1}, + -1}, {"GBK2K-H", g_FXCMAP_GBK2K_H_5, g_FXCMAP_GBK2K_H_5_DWord, 4071, 1017, - FXCMAP_CMap::Range, FXCMAP_CMap::Range, -4}, - {"GBK2K-V", g_FXCMAP_GBK2K_V_5, nullptr, 41, 0, FXCMAP_CMap::Range, - FXCMAP_CMap::None, -1}, + FXCMAP_CMap::Range, -4}, + {"GBK2K-V", g_FXCMAP_GBK2K_V_5, nullptr, 41, 0, FXCMAP_CMap::Range, -1}, {"UniGB-UCS2-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0, - FXCMAP_CMap::Range, FXCMAP_CMap::None, 0}, + FXCMAP_CMap::Range, 0}, {"UniGB-UCS2-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0, - FXCMAP_CMap::Range, FXCMAP_CMap::None, -1}, + FXCMAP_CMap::Range, -1}, {"UniGB-UTF16-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0, - FXCMAP_CMap::Range, FXCMAP_CMap::None, 0}, + FXCMAP_CMap::Range, 0}, {"UniGB-UTF16-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0, - FXCMAP_CMap::Range, FXCMAP_CMap::None, -1}, + FXCMAP_CMap::Range, -1}, }; void CPDF_ModuleMgr::LoadEmbeddedGB1CMaps() { -- cgit v1.2.3