core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp - Issue 1439223003: Merge to XFA: Remove relative includes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: fix merge Created 5 years, 1 month 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

« no previous file with comments | « core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp ('k') | core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp » ('j') | no next file with comments »

OLD	NEW
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 "cmaps_japan1.h"	7 #include "cmaps_japan1.h"

8	8

9 #include "../../fpdf_font/font_int.h"

10 #include "../cmap_int.h"

11 #include "core/include/fpdfapi/fpdf_module.h"	9 #include "core/include/fpdfapi/fpdf_module.h"

12 #include "core/include/fpdfapi/fpdf_resource.h"	10 #include "core/include/fpdfapi/fpdf_resource.h"

13 #include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().	11 #include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize().

	12 #include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h"

	13 #include "core/src/fpdfapi/fpdf_font/font_int.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, NULL, 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, NULL, 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, NULL, 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, NULL, 0, -2},

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 CPDF_FontGlobals* pFontGlobals =	57 CPDF_FontGlobals* pFontGlobals =

58 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();	58 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();

59 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_pMapList =	59 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_pMapList =

60 g_FXCMAP_Japan1_cmaps;	60 g_FXCMAP_Japan1_cmaps;

61 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_Count =	61 pFontGlobals->m_EmbeddedCharsets[CIDSET_JAPAN1].m_Count =

62 FX_ArraySize(g_FXCMAP_Japan1_cmaps);	62 FX_ArraySize(g_FXCMAP_Japan1_cmaps);

63 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_pMap =	63 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_pMap =

64 g_FXCMAP_Japan1CID2Unicode_4;	64 g_FXCMAP_Japan1CID2Unicode_4;

65 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_Count = 15444;	65 pFontGlobals->m_EmbeddedToUnicodes[CIDSET_JAPAN1].m_Count = 15444;

66 }	66 }

OLD	NEW