| Index: core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
|
| index 26d4cd63589a68f83f32f4af4bc9a261daba5230..bf79ced6e6d31a8cff0cf8cf73252d315601478f 100644
|
| --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
|
| +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp
|
| @@ -12,27 +12,43 @@
|
| #include "cmaps_gb1.h"
|
|
|
| static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
|
| - { "GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None, NULL, 0, 0 },
|
| - { "GB-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_V_0, 20, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "GBpc-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_H_0, 91, FXCMAP_CMap::None, NULL, 0, 0 },
|
| - { "GBpc-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_V_0, 20, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "GBK-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_H_2, 4071, FXCMAP_CMap::None, NULL, 0, 0 },
|
| - { "GBK-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_V_2, 20, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "GBKp-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_H_2, 4070, FXCMAP_CMap::None, NULL, 0, -2 },
|
| - { "GBKp-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_V_2, 20, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "GBK2K-H", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_H_5, 4071, FXCMAP_CMap::Single, g_FXCMAP_GBK2K_H_5_DWord, 1017, -4 },
|
| - { "GBK2K-V", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_V_5, 41, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "UniGB-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825, FXCMAP_CMap::None, NULL, 0, 0 },
|
| - { "UniGB-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24, FXCMAP_CMap::None, NULL, 0, -1 },
|
| - { "UniGB-UTF16-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825, FXCMAP_CMap::None, NULL, 0, 0 },
|
| - { "UniGB-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24, FXCMAP_CMap::None, NULL, 0, -1 },
|
| + {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
|
| + NULL, 0, 0},
|
| + {"GB-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_V_0, 20, FXCMAP_CMap::None,
|
| + NULL, 0, -1},
|
| + {"GBpc-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_H_0, 91,
|
| + FXCMAP_CMap::None, NULL, 0, 0},
|
| + {"GBpc-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_V_0, 20,
|
| + FXCMAP_CMap::None, NULL, 0, -1},
|
| + {"GBK-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_H_2, 4071,
|
| + FXCMAP_CMap::None, NULL, 0, 0},
|
| + {"GBK-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_V_2, 20,
|
| + FXCMAP_CMap::None, NULL, 0, -1},
|
| + {"GBKp-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_H_2, 4070,
|
| + FXCMAP_CMap::None, NULL, 0, -2},
|
| + {"GBKp-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_V_2, 20,
|
| + FXCMAP_CMap::None, NULL, 0, -1},
|
| + {"GBK2K-H", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_H_5, 4071,
|
| + FXCMAP_CMap::Single, g_FXCMAP_GBK2K_H_5_DWord, 1017, -4},
|
| + {"GBK2K-V", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_V_5, 41, FXCMAP_CMap::None,
|
| + NULL, 0, -1},
|
| + {"UniGB-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
|
| + FXCMAP_CMap::None, NULL, 0, 0},
|
| + {"UniGB-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
|
| + FXCMAP_CMap::None, NULL, 0, -1},
|
| + {"UniGB-UTF16-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
|
| + FXCMAP_CMap::None, NULL, 0, 0},
|
| + {"UniGB-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
|
| + FXCMAP_CMap::None, NULL, 0, -1},
|
| };
|
|
|
| -void CPDF_ModuleMgr::LoadEmbeddedGB1CMaps()
|
| -{
|
| - CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
|
| - pFontGlobals->m_EmbeddedCharsets[CIDSET_GB1].m_pMapList = g_FXCMAP_GB1_cmaps;
|
| - pFontGlobals->m_EmbeddedCharsets[CIDSET_GB1].m_Count = FX_ArraySize(g_FXCMAP_GB1_cmaps);
|
| - pFontGlobals->m_EmbeddedToUnicodes[CIDSET_GB1].m_pMap = g_FXCMAP_GB1CID2Unicode_5;
|
| - pFontGlobals->m_EmbeddedToUnicodes[CIDSET_GB1].m_Count = 30284;
|
| +void CPDF_ModuleMgr::LoadEmbeddedGB1CMaps() {
|
| + CPDF_FontGlobals* pFontGlobals =
|
| + CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
|
| + pFontGlobals->m_EmbeddedCharsets[CIDSET_GB1].m_pMapList = g_FXCMAP_GB1_cmaps;
|
| + pFontGlobals->m_EmbeddedCharsets[CIDSET_GB1].m_Count =
|
| + FX_ArraySize(g_FXCMAP_GB1_cmaps);
|
| + pFontGlobals->m_EmbeddedToUnicodes[CIDSET_GB1].m_pMap =
|
| + g_FXCMAP_GB1CID2Unicode_5;
|
| + pFontGlobals->m_EmbeddedToUnicodes[CIDSET_GB1].m_Count = 30284;
|
| }
|
|
|