Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(740)

Side by Side Diff: core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" 7 #include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h"
8 8
9 #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" 9 #include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
10 #include "core/fpdfapi/fpdf_font/font_int.h" 10 #include "core/fpdfapi/fpdf_font/font_int.h"
11 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" 11 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
12 #include "core/fpdfapi/include/cpdf_modulemgr.h" 12 #include "core/fpdfapi/include/cpdf_modulemgr.h"
13 #include "core/fxcrt/include/fx_basic.h" 13 #include "core/fxcrt/include/fx_basic.h"
14 14
15 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { 15 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
16 {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222, 16 {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
17 FXCMAP_CMap::None, NULL, 0, 0}, 17 FXCMAP_CMap::None, nullptr, 0, 0},
18 {"90ms-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_H_2, 171, 18 {"90ms-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_H_2, 171,
19 FXCMAP_CMap::None, NULL, 0, 0}, 19 FXCMAP_CMap::None, nullptr, 0, 0},
20 {"90ms-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_V_2, 78, 20 {"90ms-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_V_2, 78,
21 FXCMAP_CMap::None, NULL, 0, -1}, 21 FXCMAP_CMap::None, nullptr, 0, -1},
22 {"90msp-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_H_2, 170, 22 {"90msp-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_H_2, 170,
23 FXCMAP_CMap::None, NULL, 0, -2}, 23 FXCMAP_CMap::None, nullptr, 0, -2},
24 {"90msp-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_V_2, 78, 24 {"90msp-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_V_2, 78,
25 FXCMAP_CMap::None, NULL, 0, -1}, 25 FXCMAP_CMap::None, nullptr, 0, -1},
26 {"90pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90pv_RKSJ_H_1, 263, 26 {"90pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90pv_RKSJ_H_1, 263,
27 FXCMAP_CMap::None, NULL, 0, 0}, 27 FXCMAP_CMap::None, nullptr, 0, 0},
28 {"Add-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_H_1, 635, 28 {"Add-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_H_1, 635,
29 FXCMAP_CMap::None, NULL, 0, 0}, 29 FXCMAP_CMap::None, nullptr, 0, 0},
30 {"Add-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_V_1, 57, 30 {"Add-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_V_1, 57,
31 FXCMAP_CMap::None, NULL, 0, -1}, 31 FXCMAP_CMap::None, nullptr, 0, -1},
32 {"EUC-H", FXCMAP_CMap::Range, g_FXCMAP_EUC_H_1, 120, FXCMAP_CMap::None, 32 {"EUC-H", FXCMAP_CMap::Range, g_FXCMAP_EUC_H_1, 120, FXCMAP_CMap::None,
33 NULL, 0, 0}, 33 nullptr, 0, 0},
34 {"EUC-V", FXCMAP_CMap::Range, g_FXCMAP_EUC_V_1, 27, FXCMAP_CMap::None, NULL, 34 {"EUC-V", FXCMAP_CMap::Range, g_FXCMAP_EUC_V_1, 27, FXCMAP_CMap::None,
35 0, -1}, 35 nullptr, 0, -1},
36 {"Ext-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_H_2, 665, 36 {"Ext-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_H_2, 665,
37 FXCMAP_CMap::None, NULL, 0, -4}, 37 FXCMAP_CMap::None, nullptr, 0, -4},
38 {"Ext-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_V_2, 39, 38 {"Ext-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_V_2, 39,
39 FXCMAP_CMap::None, NULL, 0, -1}, 39 FXCMAP_CMap::None, nullptr, 0, -1},
40 {"H", FXCMAP_CMap::Range, g_FXCMAP_H_1, 118, FXCMAP_CMap::None, NULL, 0, 0}, 40 {"H", FXCMAP_CMap::Range, g_FXCMAP_H_1, 118, FXCMAP_CMap::None, nullptr, 0,
41 {"V", FXCMAP_CMap::Range, g_FXCMAP_V_1, 27, FXCMAP_CMap::None, NULL, 0, -1}, 41 0},
42 {"V", FXCMAP_CMap::Range, g_FXCMAP_V_1, 27, FXCMAP_CMap::None, nullptr, 0,
43 -1},
42 {"UniJIS-UCS2-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772, 44 {"UniJIS-UCS2-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
43 FXCMAP_CMap::None, NULL, 0, 0}, 45 FXCMAP_CMap::None, nullptr, 0, 0},
44 {"UniJIS-UCS2-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251, 46 {"UniJIS-UCS2-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
45 FXCMAP_CMap::None, NULL, 0, -1}, 47 FXCMAP_CMap::None, nullptr, 0, -1},
46 {"UniJIS-UCS2-HW-H", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_H_4, 4, 48 {"UniJIS-UCS2-HW-H", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_H_4, 4,
47 FXCMAP_CMap::None, NULL, 0, -2}, 49 FXCMAP_CMap::None, nullptr, 0, -2},
48 {"UniJIS-UCS2-HW-V", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_V_4, 199, 50 {"UniJIS-UCS2-HW-V", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_V_4, 199,
49 FXCMAP_CMap::None, NULL, 0, -1}, 51 FXCMAP_CMap::None, nullptr, 0, -1},
50 {"UniJIS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772, 52 {"UniJIS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
51 FXCMAP_CMap::None, NULL, 0, 0}, 53 FXCMAP_CMap::None, nullptr, 0, 0},
52 {"UniJIS-UTF16-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251, 54 {"UniJIS-UTF16-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
53 FXCMAP_CMap::None, NULL, 0, -1}, 55 FXCMAP_CMap::None, nullptr, 0, -1},
54 }; 56 };
55 57
56 void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() { 58 void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() {
57 CPDF_FontGlobals* pFontGlobals = 59 CPDF_FontGlobals* pFontGlobals =
58 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); 60 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
59 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_pMapList = 61 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_pMapList =
60 g_FXCMAP_Japan1_cmaps; 62 g_FXCMAP_Japan1_cmaps;
61 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_Count = 63 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_Count =
62 FX_ArraySize(g_FXCMAP_Japan1_cmaps); 64 FX_ArraySize(g_FXCMAP_Japan1_cmaps);
63 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_pMap = 65 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_pMap =
64 g_FXCMAP_Japan1CID2Unicode_4; 66 g_FXCMAP_Japan1CID2Unicode_4;
65 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_Count = 15444; 67 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_Count = 15444;
66 } 68 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp ('k') | core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698