Put FXCMAP code in namespace fxcmap Use a C++ namespace instead of a prefix. Also do some IWYU in some modified headers. Change-Id: I5ee89f07841b3b599afbb4744b598424da4ba04c Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/106231 Reviewed-by: Nigi <nigi@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp b/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp index 68d9ab3..154233b 100644 --- a/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp +++ b/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_CNS1CID2Unicode_5[19088] = { +namespace fxcmap { + +const uint16_t kCNS1CID2Unicode_5[19088] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, @@ -2129,3 +2131,5 @@ 0x0000, 0x0000, 0x456D, 0x38D4, 0x0000, 0x4561, 0x451B, 0x4D89, 0x4C7B, 0x4D76, 0x45EA, 0x3FC8, 0x0000, 0x3661, 0x44DE, 0x44BD, 0x41ED, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp b/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp index acdf90d..d24620c 100644 --- a/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/B5pc-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_B5pc_H_0[247 * 3] = { +namespace fxcmap { + +const uint16_t kB5pc_H_0[247 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x003D, 0x00FD, 0x00FF, 0x0060, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF, 0xA15D, 0xA17E, 0x0080, 0xA1A1, 0xA1F5, 0x00A2, 0xA1F6, 0xA1F6, 0x00F8, 0xA1F7, 0xA1F7, 0x00F7, @@ -91,3 +93,5 @@ 0xF9C5, 0xF9C5, 0x353D, 0xF9C6, 0xF9C6, 0x3549, 0xF9C7, 0xF9D1, 0x353E, 0xF9D2, 0xF9D5, 0x354A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp b/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp index 690f1ed..b7a17a5 100644 --- a/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/B5pc-V_0.cpp
@@ -6,9 +6,13 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_B5pc_V_0[12 * 3] = { +namespace fxcmap { + +const uint16_t kB5pc_V_0[12 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A, 0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092, 0xA171, 0xA172, 0x0096, 0xA175, 0xA176, 0x009A, 0xA179, 0xA17A, 0x009E, 0xA1E3, 0xA1E3, 0x354F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp b/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp index 545623a..cfa4eac 100644 --- a/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_CNS_EUC_H_0[157 * 3] = { +namespace fxcmap { + +const uint16_t kCNS_EUC_H_0[157 * 3] = { 0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1FE, 0x0063, 0xA2A1, 0xA2FE, 0x00C1, 0xA3A1, 0xA3CE, 0x011F, 0xA4A1, 0xA4FE, 0x014D, 0xA5A1, 0xA5EC, 0x01AB, 0xA5EE, 0xA5F0, 0x01F7, 0xA6A1, 0xA6BE, 0x01FA, 0xA7A1, 0xA7A1, 0x0253, @@ -62,7 +64,7 @@ 0xFDA1, 0xFDCB, 0x1741, }; -const FXCMAP_DWordCIDMap kFXCMAP_CNS_EUC_H_0_DWord[238] = { +const DWordCIDMap kCNS_EUC_H_0_DWord[238] = { {0x8EA1, 0xA1A1, 0xA1FE, 0x0063}, {0x8EA1, 0xA2A1, 0xA2FE, 0x00C1}, {0x8EA1, 0xA3A1, 0xA3CE, 0x011F}, {0x8EA1, 0xA4A1, 0xA4FE, 0x014D}, {0x8EA1, 0xA5A1, 0xA5EC, 0x01AB}, {0x8EA1, 0xA5EE, 0xA5F0, 0x01F7}, @@ -183,3 +185,5 @@ {0x8EA2, 0xEFA1, 0xEFFE, 0x3410}, {0x8EA2, 0xF0A1, 0xF0FE, 0x346E}, {0x8EA2, 0xF1A1, 0xF1FE, 0x34CC}, {0x8EA2, 0xF2A1, 0xF2C4, 0x352A}, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp b/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp index 0ce79e9..97834d9 100644 --- a/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_CNS_EUC_V_0[180 * 3] = { +namespace fxcmap { + +const uint16_t kCNS_EUC_V_0[180 * 3] = { 0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1AB, 0x0063, 0xA1AC, 0xA1AC, 0x354E, 0xA1AD, 0xA1BA, 0x006F, 0xA1BB, 0xA1BB, 0x007C, 0xA1BC, 0xA1BC, 0x007E, 0xA1BD, 0xA1BD, 0x007E, 0xA1BE, 0xA1BF, 0x0082, 0xA1C0, 0xA1C1, 0x0082, @@ -69,7 +71,7 @@ 0xFBA1, 0xFBFE, 0x1685, 0xFCA1, 0xFCFE, 0x16E3, 0xFDA1, 0xFDCB, 0x1741, }; -const FXCMAP_DWordCIDMap kFXCMAP_CNS_EUC_V_0_DWord[261] = { +const DWordCIDMap kCNS_EUC_V_0_DWord[261] = { {0x8EA1, 0xA1A1, 0xA1AB, 0x0063}, {0x8EA1, 0xA1AC, 0xA1AC, 0x354E}, {0x8EA1, 0xA1AD, 0xA1BA, 0x006F}, {0x8EA1, 0xA1BB, 0xA1BB, 0x007C}, {0x8EA1, 0xA1BC, 0xA1BC, 0x007E}, {0x8EA1, 0xA1BD, 0xA1BD, 0x007E}, @@ -202,3 +204,5 @@ {0x8EA2, 0xF0A1, 0xF0FE, 0x346E}, {0x8EA2, 0xF1A1, 0xF1FE, 0x34CC}, {0x8EA2, 0xF2A1, 0xF2C4, 0x352A}, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp b/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp index 6be9a0a..44687c1 100644 --- a/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_ETen_B5_H_0[254 * 3] = { +namespace fxcmap { + +const uint16_t kETen_B5_H_0[254 * 3] = { 0x0020, 0x007E, 0x3550, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF, 0xA15D, 0xA17E, 0x0080, 0xA1A1, 0xA1F5, 0x00A2, 0xA1F6, 0xA1F6, 0x00F8, 0xA1F7, 0xA1F7, 0x00F7, 0xA1F8, 0xA1FE, 0x00F9, 0xA240, 0xA27E, 0x0100, @@ -93,3 +95,5 @@ 0xF9C5, 0xF9C5, 0x353D, 0xF9C6, 0xF9C6, 0x3549, 0xF9C7, 0xF9D1, 0x353E, 0xF9D2, 0xF9D5, 0x354A, 0xF9D6, 0xF9FE, 0x36E8, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp b/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp index a522aa0..38359e8 100644 --- a/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0.cpp
@@ -6,10 +6,14 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_ETen_B5_V_0[13 * 3] = { +namespace fxcmap { + +const uint16_t kETen_B5_V_0[13 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A, 0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092, 0xA171, 0xA172, 0x0096, 0xA175, 0xA176, 0x009A, 0xA179, 0xA17A, 0x009E, 0xA1E3, 0xA1E3, 0x354F, 0xC6E4, 0xC6E5, 0x3711, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp b/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp index fef10a3..0f44566 100644 --- a/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0.cpp
@@ -6,8 +6,12 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_ETenms_B5_H_0[1 * 3] = { +namespace fxcmap { + +const uint16_t kETenms_B5_H_0[1 * 3] = { 0x0020, 0x007E, 0x0001, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp b/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp index 98cab38..5aafd16 100644 --- a/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_ETenms_B5_V_0[18 * 3] = { +namespace fxcmap { + +const uint16_t kETenms_B5_V_0[18 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA14C, 0xA14C, 0x006D, 0xA156, 0xA156, 0x0138, 0xA158, 0xA158, 0x007A, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A, @@ -14,3 +16,5 @@ 0xA175, 0xA176, 0x009A, 0xA179, 0xA17A, 0x009E, 0xA17D, 0xA17E, 0x0082, 0xA1A1, 0xA1A2, 0x0086, 0xA1A3, 0xA1A4, 0x008A, 0xC6E4, 0xC6E5, 0x3711, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp b/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp index 38ece6f..e073f3e 100644 --- a/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp +++ b/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_HKscs_B5_H_5[1210 * 3] = { +namespace fxcmap { + +const uint16_t kHKscs_B5_H_5[1210 * 3] = { 0x0020, 0x007E, 0x0001, 0x8740, 0x8765, 0x4A15, 0x8767, 0x8779, 0x4A3B, 0x8840, 0x8855, 0x44C9, 0x8856, 0x887E, 0x4961, 0x88A1, 0x88A8, 0x498A, 0x88A9, 0x88AA, 0x499C, 0x8940, 0x8941, 0x4534, 0x8943, 0x8943, 0x4536, @@ -412,3 +414,5 @@ 0xFEDE, 0xFEDF, 0x495D, 0xFEE0, 0xFEEC, 0x42EB, 0xFEED, 0xFEEE, 0x495F, 0xFEEF, 0xFEFE, 0x42F8, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp b/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp index 722dd43..ab6418c 100644 --- a/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp +++ b/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5.cpp
@@ -6,10 +6,14 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_HKscs_B5_V_5[13 * 3] = { +namespace fxcmap { + +const uint16_t kHKscs_B5_V_5[13 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1, 0xA15D, 0xA15E, 0x0082, 0xA161, 0xA162, 0x0086, 0xA165, 0xA166, 0x008A, 0xA169, 0xA16A, 0x008E, 0xA16D, 0xA16E, 0x0092, 0xA171, 0xA172, 0x0096, 0xA175, 0xA176, 0x009A, 0xA179, 0xA17A, 0x009E, 0xA1E3, 0xA1E3, 0x354F, 0xC6E4, 0xC6E5, 0x3711, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp index 29380a1..fb13a37 100644 --- a/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp +++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_UniCNS_UCS2_H_3[16418 * 3] = { +namespace fxcmap { + +const uint16_t kUniCNS_UCS2_H_3[16418 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A2, 0x00A3, 0x0106, 0x00A5, 0x00A5, 0x0104, 0x00A7, 0x00A7, 0x00B2, 0x00A8, 0x00A8, 0x35B3, 0x00AC, 0x00AC, 0x36E1, 0x00B0, 0x00B0, 0x0118, 0x00B1, 0x00B1, 0x00D4, 0x00B7, 0x00B7, 0x0073, @@ -5481,3 +5483,5 @@ 0xFF5C, 0xFF5C, 0x0078, 0xFF5D, 0xFF5D, 0x0085, 0xFF64, 0xFF64, 0x0071, 0xFFE2, 0xFFE2, 0x36E1, 0xFFE4, 0xFFE4, 0x36E2, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp index 82ef212..36cb2a6 100644 --- a/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp +++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3.cpp
@@ -6,10 +6,14 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_UniCNS_UCS2_V_3[13 * 3] = { +namespace fxcmap { + +const uint16_t kUniCNS_UCS2_V_3[13 * 3] = { 0x2013, 0x2013, 0x0078, 0x2014, 0x2014, 0x007A, 0x2025, 0x2025, 0x006D, 0x3008, 0x3009, 0x0096, 0x300A, 0x300B, 0x0092, 0x300C, 0x300D, 0x009A, 0x300E, 0x300F, 0x009E, 0x3010, 0x3011, 0x008E, 0x3014, 0x3015, 0x008A, 0xFE4F, 0xFE4F, 0x35B1, 0xFF08, 0xFF09, 0x0082, 0xFF5B, 0xFF5B, 0x0086, 0xFF5D, 0xFF5D, 0x0087, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp b/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp index 4d98cad..05fc715 100644 --- a/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp +++ b/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/CNS1/cmaps_cns1.h" -const uint16_t kFXCMAP_UniCNS_UTF16_H_0[14557 * 2] = { +namespace fxcmap { + +const uint16_t kUniCNS_UTF16_H_0[14557 * 2] = { 0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024, 0x0005, 0x0025, 0x0006, 0x0026, 0x0007, 0x0027, 0x0008, 0x0028, 0x0009, 0x0029, 0x000A, 0x002A, 0x000B, 0x002B, 0x000C, 0x002C, 0x000D, 0x002D, @@ -3243,3 +3245,5 @@ 0x0085, 0xFF5E, 0x00E4, 0xFF64, 0x0071, 0xFFE0, 0x0106, 0xFFE1, 0x0107, 0xFFE2, 0x36E1, 0xFFE3, 0x00C4, 0xFFE4, 0x36E2, 0xFFE5, 0x0104, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp index ae180b0..53038f6 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -8,31 +8,25 @@ #include <iterator> -const FXCMAP_CMap kFXCMAP_CNS1_cmaps[] = { - {"B5pc-H", kFXCMAP_B5pc_H_0, nullptr, 247, 0, FXCMAP_CMap::Range, 0}, - {"B5pc-V", kFXCMAP_B5pc_V_0, nullptr, 12, 0, FXCMAP_CMap::Range, -1}, - {"HKscs-B5-H", kFXCMAP_HKscs_B5_H_5, nullptr, 1210, 0, FXCMAP_CMap::Range, - 0}, - {"HKscs-B5-V", kFXCMAP_HKscs_B5_V_5, nullptr, 13, 0, FXCMAP_CMap::Range, - -1}, - {"ETen-B5-H", kFXCMAP_ETen_B5_H_0, nullptr, 254, 0, FXCMAP_CMap::Range, 0}, - {"ETen-B5-V", kFXCMAP_ETen_B5_V_0, nullptr, 13, 0, FXCMAP_CMap::Range, -1}, - {"ETenms-B5-H", kFXCMAP_ETenms_B5_H_0, nullptr, 1, 0, FXCMAP_CMap::Range, - -2}, - {"ETenms-B5-V", kFXCMAP_ETenms_B5_V_0, nullptr, 18, 0, FXCMAP_CMap::Range, - -1}, - {"CNS-EUC-H", kFXCMAP_CNS_EUC_H_0, kFXCMAP_CNS_EUC_H_0_DWord, 157, 238, - FXCMAP_CMap::Range, 0}, - {"CNS-EUC-V", kFXCMAP_CNS_EUC_V_0, kFXCMAP_CNS_EUC_V_0_DWord, 180, 261, - FXCMAP_CMap::Range, 0}, - {"UniCNS-UCS2-H", kFXCMAP_UniCNS_UCS2_H_3, nullptr, 16418, 0, - FXCMAP_CMap::Range, 0}, - {"UniCNS-UCS2-V", kFXCMAP_UniCNS_UCS2_V_3, nullptr, 13, 0, - FXCMAP_CMap::Range, -1}, - {"UniCNS-UTF16-H", kFXCMAP_UniCNS_UTF16_H_0, nullptr, 14557, 0, - FXCMAP_CMap::Single, 0}, - {"UniCNS-UTF16-V", kFXCMAP_UniCNS_UCS2_V_3, nullptr, 13, 0, - FXCMAP_CMap::Range, -1}, +namespace fxcmap { + +const CMap kCNS1_cmaps[] = { + {"B5pc-H", kB5pc_H_0, nullptr, 247, 0, CMap::Range, 0}, + {"B5pc-V", kB5pc_V_0, nullptr, 12, 0, CMap::Range, -1}, + {"HKscs-B5-H", kHKscs_B5_H_5, nullptr, 1210, 0, CMap::Range, 0}, + {"HKscs-B5-V", kHKscs_B5_V_5, nullptr, 13, 0, CMap::Range, -1}, + {"ETen-B5-H", kETen_B5_H_0, nullptr, 254, 0, CMap::Range, 0}, + {"ETen-B5-V", kETen_B5_V_0, nullptr, 13, 0, CMap::Range, -1}, + {"ETenms-B5-H", kETenms_B5_H_0, nullptr, 1, 0, CMap::Range, -2}, + {"ETenms-B5-V", kETenms_B5_V_0, nullptr, 18, 0, CMap::Range, -1}, + {"CNS-EUC-H", kCNS_EUC_H_0, kCNS_EUC_H_0_DWord, 157, 238, CMap::Range, 0}, + {"CNS-EUC-V", kCNS_EUC_V_0, kCNS_EUC_V_0_DWord, 180, 261, CMap::Range, 0}, + {"UniCNS-UCS2-H", kUniCNS_UCS2_H_3, nullptr, 16418, 0, CMap::Range, 0}, + {"UniCNS-UCS2-V", kUniCNS_UCS2_V_3, nullptr, 13, 0, CMap::Range, -1}, + {"UniCNS-UTF16-H", kUniCNS_UTF16_H_0, nullptr, 14557, 0, CMap::Single, 0}, + {"UniCNS-UTF16-V", kUniCNS_UCS2_V_3, nullptr, 13, 0, CMap::Range, -1}, }; -const size_t kFXCMAP_CNS1_cmaps_size = std::size(kFXCMAP_CNS1_cmaps); +const size_t kCNS1_cmaps_size = std::size(kCNS1_cmaps); + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h index 78ec0dd..75b31cb 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.h
@@ -8,26 +8,31 @@ #define CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_ #include <stddef.h> +#include <stdint.h> #include "core/fpdfapi/cmaps/fpdf_cmaps.h" -extern const uint16_t kFXCMAP_B5pc_H_0[]; -extern const uint16_t kFXCMAP_B5pc_V_0[]; -extern const uint16_t kFXCMAP_HKscs_B5_H_5[]; -extern const uint16_t kFXCMAP_HKscs_B5_V_5[]; -extern const uint16_t kFXCMAP_ETen_B5_H_0[]; -extern const uint16_t kFXCMAP_ETen_B5_V_0[]; -extern const uint16_t kFXCMAP_ETenms_B5_H_0[]; -extern const uint16_t kFXCMAP_ETenms_B5_V_0[]; -extern const uint16_t kFXCMAP_CNS_EUC_H_0[]; -extern const FXCMAP_DWordCIDMap kFXCMAP_CNS_EUC_H_0_DWord[]; -extern const uint16_t kFXCMAP_CNS_EUC_V_0[]; -extern const FXCMAP_DWordCIDMap kFXCMAP_CNS_EUC_V_0_DWord[]; -extern const uint16_t kFXCMAP_UniCNS_UCS2_H_3[]; -extern const uint16_t kFXCMAP_UniCNS_UCS2_V_3[]; -extern const uint16_t kFXCMAP_UniCNS_UTF16_H_0[]; -extern const uint16_t kFXCMAP_CNS1CID2Unicode_5[19088]; -extern const FXCMAP_CMap kFXCMAP_CNS1_cmaps[]; -extern const size_t kFXCMAP_CNS1_cmaps_size; +namespace fxcmap { + +extern const uint16_t kB5pc_H_0[]; +extern const uint16_t kB5pc_V_0[]; +extern const uint16_t kHKscs_B5_H_5[]; +extern const uint16_t kHKscs_B5_V_5[]; +extern const uint16_t kETen_B5_H_0[]; +extern const uint16_t kETen_B5_V_0[]; +extern const uint16_t kETenms_B5_H_0[]; +extern const uint16_t kETenms_B5_V_0[]; +extern const uint16_t kCNS_EUC_H_0[]; +extern const DWordCIDMap kCNS_EUC_H_0_DWord[]; +extern const uint16_t kCNS_EUC_V_0[]; +extern const DWordCIDMap kCNS_EUC_V_0_DWord[]; +extern const uint16_t kUniCNS_UCS2_H_3[]; +extern const uint16_t kUniCNS_UCS2_V_3[]; +extern const uint16_t kUniCNS_UTF16_H_0[]; +extern const uint16_t kCNS1CID2Unicode_5[19088]; +extern const CMap kCNS1_cmaps[]; +extern const size_t kCNS1_cmaps_size; + +} // namespace fxcmap #endif // CORE_FPDFAPI_CMAPS_CNS1_CMAPS_CNS1_H_
diff --git a/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp b/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp index 294f2e4..b987a24 100644 --- a/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp +++ b/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GB1CID2Unicode_5[30284] = { +namespace fxcmap { + +const uint16_t kGB1CID2Unicode_5[30284] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, @@ -3373,3 +3375,5 @@ 0xA4B6, 0xA4B7, 0xA4B8, 0xA4B9, 0xA4BA, 0xA4BB, 0xA4BC, 0xA4BD, 0xA4BE, 0xA4BF, 0xA4C0, 0xA4C1, 0xA4C2, 0xA4C3, 0xA4C4, 0xA4C5, 0xA4C6, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp b/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp index 5133eab..6abfa33 100644 --- a/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp +++ b/core/fpdfapi/cmaps/GB1/GB-EUC-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GB_EUC_H_0[90 * 3] = { +namespace fxcmap { + +const uint16_t kGB_EUC_H_0[90 * 3] = { 0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0xA1A1, 0xA1FE, 0x0060, 0xA2B1, 0xA2E2, 0x00BE, 0xA2E5, 0xA2EE, 0x00F0, 0xA2F1, 0xA2FC, 0x00FA, 0xA3A1, 0xA3FE, 0x0106, 0xA4A1, 0xA4F3, 0x0164, 0xA5A1, 0xA5F6, 0x01B7, @@ -38,3 +40,5 @@ 0xF2A1, 0xF2FE, 0x1BE3, 0xF3A1, 0xF3FE, 0x1C41, 0xF4A1, 0xF4FE, 0x1C9F, 0xF5A1, 0xF5FE, 0x1CFD, 0xF6A1, 0xF6FE, 0x1D5B, 0xF7A1, 0xF7FE, 0x1DB9, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp b/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp index 1a33c85..0f3d136 100644 --- a/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp +++ b/core/fpdfapi/cmaps/GB1/GB-EUC-V_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GB_EUC_V_0[20 * 3] = { +namespace fxcmap { + +const uint16_t kGB_EUC_V_0[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, 0xA1AB, 0xA1AC, 0x1E18, 0xA1AD, 0xA1AD, 0x0257, 0xA1B2, 0xA1BF, 0x0246, 0xA1FE, 0xA1FE, 0x1E1A, 0xA3A1, 0xA3A1, 0x0242, 0xA3A8, 0xA3A9, 0x0244, @@ -15,3 +17,5 @@ 0xA3DD, 0xA3DD, 0x1E1E, 0xA3DF, 0xA3DF, 0x0258, 0xA3FB, 0xA3FB, 0x0254, 0xA3FD, 0xA3FD, 0x0255, 0xA3FE, 0xA3FE, 0x1E1F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp b/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp index 644679f..5cfc25f 100644 --- a/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp +++ b/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBK_EUC_H_2[4071 * 3] = { +namespace fxcmap { + +const uint16_t kGBK_EUC_H_2[4071 * 3] = { 0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059, 0x817A, 0x817E, 0x2791, 0x8180, 0x8185, 0x2796, 0x8186, 0x8186, 0x21F1, 0x8187, 0x81EC, 0x279C, 0x81ED, 0x81ED, 0x1FF2, @@ -1365,3 +1367,5 @@ 0xFD9E, 0xFD9E, 0x40D3, 0xFD9F, 0xFD9F, 0x200C, 0xFDA0, 0xFDA0, 0x5083, 0xFE40, 0xFE40, 0x1259, 0xFE41, 0xFE7E, 0x5610, 0xFE80, 0xFEA0, 0x564E, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp b/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp index 96ad2f0..ea59b41 100644 --- a/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp +++ b/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBK_EUC_V_2[20 * 3] = { +namespace fxcmap { + +const uint16_t kGBK_EUC_V_2[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, 0xA1AB, 0xA1AC, 0x1E18, 0xA1AD, 0xA1AD, 0x0257, 0xA1B2, 0xA1BF, 0x0246, 0xA1FE, 0xA1FE, 0x1E1A, 0xA3A1, 0xA3A1, 0x0242, 0xA3A8, 0xA3A9, 0x0244, @@ -15,3 +17,5 @@ 0xA3DD, 0xA3DD, 0x1E1E, 0xA3DF, 0xA3DF, 0x0258, 0xA3FB, 0xA3FB, 0x0254, 0xA3FD, 0xA3FD, 0x0255, 0xA3FE, 0xA3FE, 0x1E1F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp b/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp index 73485fd..4ac5804 100644 --- a/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp +++ b/core/fpdfapi/cmaps/GB1/GBK2K-H_5.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBK2K_H_5[4071 * 3] = { +namespace fxcmap { + +const uint16_t kGBK2K_H_5[4071 * 3] = { 0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059, 0x817A, 0x817E, 0x2791, 0x8180, 0x8185, 0x2796, 0x8186, 0x8186, 0x21F1, 0x8187, 0x81EC, 0x279C, 0x81ED, 0x81ED, 0x1FF2, 0x81EE, 0x81F5, 0x2802, @@ -1366,7 +1368,7 @@ 0xFE40, 0xFE40, 0x1259, 0xFE41, 0xFE7E, 0x5610, 0xFE80, 0xFEA0, 0x564E, }; -const FXCMAP_DWordCIDMap kFXCMAP_GBK2K_H_5_DWord[1017] = { +const DWordCIDMap kGBK2K_H_5_DWord[1017] = { {0x8130, 0x8436, 0x8436, 0x5752}, {0x8138, 0xFD38, 0xFD39, 0x579C}, {0x8138, 0xFE30, 0xFE39, 0x579E}, {0x8139, 0x8130, 0x8137, 0x57A8}, {0x8139, 0x8139, 0x8139, 0x57B0}, {0x8139, 0x8230, 0x8239, 0x57B1}, @@ -1877,3 +1879,5 @@ {0x8236, 0x9230, 0x9239, 0x7632}, {0x8236, 0x9330, 0x9339, 0x763C}, {0x8236, 0x9430, 0x9435, 0x7646}, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp b/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp index a9e5cde..904253f 100644 --- a/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp +++ b/core/fpdfapi/cmaps/GB1/GBK2K-V_5.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBK2K_V_5[41 * 3] = { +namespace fxcmap { + +const uint16_t kGBK2K_V_5[41 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, 0xA1AB, 0xA1AC, 0x1E18, 0xA1AD, 0xA1AD, 0x0257, 0xA1B2, 0xA1BF, 0x0246, 0xA1FE, 0xA1FE, 0x1E1A, 0xA3A1, 0xA3A1, 0x0242, 0xA3A8, 0xA3A9, 0x0244, @@ -22,3 +24,5 @@ 0xA5E3, 0xA5E3, 0x5773, 0xA5E5, 0xA5E5, 0x5775, 0xA5E7, 0xA5E7, 0x5774, 0xA5EE, 0xA5EE, 0x5772, 0xA960, 0xA960, 0x577A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp b/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp index 43ea1a0..2de5aea 100644 --- a/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp +++ b/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBKp_EUC_H_2[4070 * 3] = { +namespace fxcmap { + +const uint16_t kGBKp_EUC_H_2[4070 * 3] = { 0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059, 0x817A, 0x817E, 0x2791, 0x8180, 0x8185, 0x2796, 0x8186, 0x8186, 0x21F1, 0x8187, 0x81EC, 0x279C, 0x81ED, 0x81ED, 0x1FF2, 0x81EE, 0x81F5, 0x2802, @@ -1365,3 +1367,5 @@ 0xFD9F, 0xFD9F, 0x200C, 0xFDA0, 0xFDA0, 0x5083, 0xFE40, 0xFE40, 0x1259, 0xFE41, 0xFE7E, 0x5610, 0xFE80, 0xFEA0, 0x564E, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp b/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp index 3c8e65d..aa55cf8 100644 --- a/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp +++ b/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBKp_EUC_V_2[20 * 3] = { +namespace fxcmap { + +const uint16_t kGBKp_EUC_V_2[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, 0xA1AB, 0xA1AC, 0x1E18, 0xA1AD, 0xA1AD, 0x0257, 0xA1B2, 0xA1BF, 0x0246, 0xA1FE, 0xA1FE, 0x1E1A, 0xA3A1, 0xA3A1, 0x0242, 0xA3A8, 0xA3A9, 0x0244, @@ -15,3 +17,5 @@ 0xA3DD, 0xA3DD, 0x1E1E, 0xA3DF, 0xA3DF, 0x0258, 0xA3FB, 0xA3FB, 0x0254, 0xA3FD, 0xA3FD, 0x0255, 0xA3FE, 0xA3FE, 0x1E1F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp b/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp index 8c670b5..f1f6dd3 100644 --- a/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp +++ b/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBpc_EUC_H_0[91 * 3] = { +namespace fxcmap { + +const uint16_t kGBpc_EUC_H_0[91 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x1E20, 0x00FD, 0x00FF, 0x1E21, 0xA1A1, 0xA1FE, 0x0060, 0xA2B1, 0xA2E2, 0x00BE, 0xA2E5, 0xA2EE, 0x00F0, 0xA2F1, 0xA2FC, 0x00FA, 0xA3A1, 0xA3FE, 0x0106, 0xA4A1, 0xA4F3, 0x0164, @@ -39,3 +41,5 @@ 0xF4A1, 0xF4FE, 0x1C9F, 0xF5A1, 0xF5FE, 0x1CFD, 0xF6A1, 0xF6FE, 0x1D5B, 0xF7A1, 0xF7FE, 0x1DB9, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp b/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp index 38b7ff9..3b53117 100644 --- a/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp +++ b/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_GBpc_EUC_V_0[20 * 3] = { +namespace fxcmap { + +const uint16_t kGBpc_EUC_V_0[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, 0xA1AB, 0xA1AC, 0x1E18, 0xA1AD, 0xA1AD, 0x0257, 0xA1B2, 0xA1BF, 0x0246, 0xA1FE, 0xA1FE, 0x1E1A, 0xA3A1, 0xA3A1, 0x0242, 0xA3A8, 0xA3A9, 0x0244, @@ -15,3 +17,5 @@ 0xA3DD, 0xA3DD, 0x1E1E, 0xA3DF, 0xA3DF, 0x0258, 0xA3FB, 0xA3FB, 0x0254, 0xA3FD, 0xA3FD, 0x0255, 0xA3FE, 0xA3FE, 0x1E1F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp index aa49016..a787a34 100644 --- a/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp +++ b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_UniGB_UCS2_H_4[13825 * 3] = { +namespace fxcmap { + +const uint16_t kUniGB_UCS2_H_4[13825 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A4, 0x00A4, 0x00A7, 0x00A5, 0x00A5, 0x5752, 0x00A7, 0x00A7, 0x00AB, 0x00A8, 0x00A8, 0x0066, 0x00B0, 0x00B0, 0x00A2, 0x00B1, 0x00B1, 0x007F, 0x00D7, 0x00D7, 0x0080, 0x00E0, 0x00E0, 0x029F, @@ -4617,3 +4619,5 @@ 0xFFE2, 0xFFE2, 0x271E, 0xFFE3, 0xFFE3, 0x0163, 0xFFE4, 0xFFE4, 0x271F, 0xFFE5, 0xFFE5, 0x0109, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp index aa0675f..34ab6e7 100644 --- a/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp +++ b/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/GB1/cmaps_gb1.h" -const uint16_t kFXCMAP_UniGB_UCS2_V_4[24 * 3] = { +namespace fxcmap { + +const uint16_t kUniGB_UCS2_V_4[24 * 3] = { 0x2014, 0x2014, 0x0256, 0x2026, 0x2026, 0x0257, 0x2225, 0x2225, 0x1E1C, 0x3001, 0x3001, 0x023F, 0x3002, 0x3002, 0x023E, 0x3008, 0x300F, 0x0248, 0x3010, 0x3011, 0x0252, 0x3013, 0x3013, 0x1E1A, 0x3014, 0x3015, 0x0246, @@ -16,3 +18,5 @@ 0xFF3D, 0xFF3D, 0x1E1E, 0xFF3F, 0xFF3F, 0x0258, 0xFF5B, 0xFF5B, 0x0254, 0xFF5D, 0xFF5D, 0x0255, 0xFF5E, 0xFF5E, 0x1E18, 0xFFE3, 0xFFE3, 0x1E1F, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp index 208eac7..03ef2d7 100644 --- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp +++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -8,29 +8,25 @@ #include <iterator> -const FXCMAP_CMap kFXCMAP_GB1_cmaps[] = { - {"GB-EUC-H", kFXCMAP_GB_EUC_H_0, nullptr, 90, 0, FXCMAP_CMap::Range, 0}, - {"GB-EUC-V", kFXCMAP_GB_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range, -1}, - {"GBpc-EUC-H", kFXCMAP_GBpc_EUC_H_0, nullptr, 91, 0, FXCMAP_CMap::Range, 0}, - {"GBpc-EUC-V", kFXCMAP_GBpc_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range, - -1}, - {"GBK-EUC-H", kFXCMAP_GBK_EUC_H_2, nullptr, 4071, 0, FXCMAP_CMap::Range, 0}, - {"GBK-EUC-V", kFXCMAP_GBK_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range, -1}, - {"GBKp-EUC-H", kFXCMAP_GBKp_EUC_H_2, nullptr, 4070, 0, FXCMAP_CMap::Range, - -2}, - {"GBKp-EUC-V", kFXCMAP_GBKp_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range, - -1}, - {"GBK2K-H", kFXCMAP_GBK2K_H_5, kFXCMAP_GBK2K_H_5_DWord, 4071, 1017, - FXCMAP_CMap::Range, -4}, - {"GBK2K-V", kFXCMAP_GBK2K_V_5, nullptr, 41, 0, FXCMAP_CMap::Range, -1}, - {"UniGB-UCS2-H", kFXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0, - FXCMAP_CMap::Range, 0}, - {"UniGB-UCS2-V", kFXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0, FXCMAP_CMap::Range, - -1}, - {"UniGB-UTF16-H", kFXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0, - FXCMAP_CMap::Range, 0}, - {"UniGB-UTF16-V", kFXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0, - FXCMAP_CMap::Range, -1}, +namespace fxcmap { + +const CMap kGB1_cmaps[] = { + {"GB-EUC-H", kGB_EUC_H_0, nullptr, 90, 0, CMap::Range, 0}, + {"GB-EUC-V", kGB_EUC_V_0, nullptr, 20, 0, CMap::Range, -1}, + {"GBpc-EUC-H", kGBpc_EUC_H_0, nullptr, 91, 0, CMap::Range, 0}, + {"GBpc-EUC-V", kGBpc_EUC_V_0, nullptr, 20, 0, CMap::Range, -1}, + {"GBK-EUC-H", kGBK_EUC_H_2, nullptr, 4071, 0, CMap::Range, 0}, + {"GBK-EUC-V", kGBK_EUC_V_2, nullptr, 20, 0, CMap::Range, -1}, + {"GBKp-EUC-H", kGBKp_EUC_H_2, nullptr, 4070, 0, CMap::Range, -2}, + {"GBKp-EUC-V", kGBKp_EUC_V_2, nullptr, 20, 0, CMap::Range, -1}, + {"GBK2K-H", kGBK2K_H_5, kGBK2K_H_5_DWord, 4071, 1017, CMap::Range, -4}, + {"GBK2K-V", kGBK2K_V_5, nullptr, 41, 0, CMap::Range, -1}, + {"UniGB-UCS2-H", kUniGB_UCS2_H_4, nullptr, 13825, 0, CMap::Range, 0}, + {"UniGB-UCS2-V", kUniGB_UCS2_V_4, nullptr, 24, 0, CMap::Range, -1}, + {"UniGB-UTF16-H", kUniGB_UCS2_H_4, nullptr, 13825, 0, CMap::Range, 0}, + {"UniGB-UTF16-V", kUniGB_UCS2_V_4, nullptr, 24, 0, CMap::Range, -1}, }; -const size_t kFXCMAP_GB1_cmaps_size = std::size(kFXCMAP_GB1_cmaps); +const size_t kGB1_cmaps_size = std::size(kGB1_cmaps); + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.h b/core/fpdfapi/cmaps/GB1/cmaps_gb1.h index e935dba..a226266 100644 --- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.h +++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.h
@@ -8,24 +8,29 @@ #define CORE_FPDFAPI_CMAPS_GB1_CMAPS_GB1_H_ #include <stddef.h> +#include <stdint.h> #include "core/fpdfapi/cmaps/fpdf_cmaps.h" -extern const uint16_t kFXCMAP_GB_EUC_H_0[]; -extern const uint16_t kFXCMAP_GB_EUC_V_0[]; -extern const uint16_t kFXCMAP_GBpc_EUC_H_0[]; -extern const uint16_t kFXCMAP_GBpc_EUC_V_0[]; -extern const uint16_t kFXCMAP_GBK_EUC_H_2[]; -extern const uint16_t kFXCMAP_GBK_EUC_V_2[]; -extern const uint16_t kFXCMAP_GBKp_EUC_H_2[]; -extern const uint16_t kFXCMAP_GBKp_EUC_V_2[]; -extern const uint16_t kFXCMAP_GBK2K_H_5[]; -extern const FXCMAP_DWordCIDMap kFXCMAP_GBK2K_H_5_DWord[]; -extern const uint16_t kFXCMAP_GBK2K_V_5[]; -extern const uint16_t kFXCMAP_UniGB_UCS2_H_4[]; -extern const uint16_t kFXCMAP_UniGB_UCS2_V_4[]; -extern const uint16_t kFXCMAP_GB1CID2Unicode_5[30284]; -extern const FXCMAP_CMap kFXCMAP_GB1_cmaps[]; -extern const size_t kFXCMAP_GB1_cmaps_size; +namespace fxcmap { + +extern const uint16_t kGB_EUC_H_0[]; +extern const uint16_t kGB_EUC_V_0[]; +extern const uint16_t kGBpc_EUC_H_0[]; +extern const uint16_t kGBpc_EUC_V_0[]; +extern const uint16_t kGBK_EUC_H_2[]; +extern const uint16_t kGBK_EUC_V_2[]; +extern const uint16_t kGBKp_EUC_H_2[]; +extern const uint16_t kGBKp_EUC_V_2[]; +extern const uint16_t kGBK2K_H_5[]; +extern const DWordCIDMap kGBK2K_H_5_DWord[]; +extern const uint16_t kGBK2K_V_5[]; +extern const uint16_t kUniGB_UCS2_H_4[]; +extern const uint16_t kUniGB_UCS2_V_4[]; +extern const uint16_t kGB1CID2Unicode_5[30284]; +extern const CMap kGB1_cmaps[]; +extern const size_t kGB1_cmaps_size; + +} // namespace fxcmap #endif // CORE_FPDFAPI_CMAPS_GB1_CMAPS_GB1_H_
diff --git a/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp index 8892336..51b49e2 100644 --- a/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_83pv_RKSJ_H_1[222 * 3] = { +namespace fxcmap { + +const uint16_t k83pv_RKSJ_H_1[222 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146, 0x00FD, 0x00FD, 0x0098, 0x00FE, 0x00FE, 0x00E4, 0x00FF, 0x00FF, 0x007C, 0x8140, 0x817E, 0x0279, 0x8180, 0x81AC, 0x02B8, 0x81B8, 0x81BF, 0x02E5, @@ -82,3 +84,5 @@ 0xEE90, 0xEE90, 0x02FA, 0xEE91, 0xEE91, 0x02F9, 0xEE92, 0xEE92, 0x0301, 0xEE93, 0xEE99, 0x1DC8, 0xEE9A, 0xEE9A, 0x0300, 0xEE9B, 0xEE9C, 0x1DCF, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp index 9faf7a3..212f809 100644 --- a/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_90ms_RKSJ_H_2[171 * 3] = { +namespace fxcmap { + +const uint16_t k90ms_RKSJ_H_2[171 * 3] = { 0x0020, 0x007D, 0x00E7, 0x007E, 0x007E, 0x0277, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, 0x8180, 0x81AC, 0x02B8, 0x81B8, 0x81BF, 0x02E5, 0x81C8, 0x81CE, 0x02ED, 0x81DA, 0x81E8, 0x02F4, 0x81F0, 0x81F7, 0x0303, @@ -65,3 +67,5 @@ 0xFA80, 0xFACF, 0x20CA, 0xFAD0, 0xFAD0, 0x07C9, 0xFAD1, 0xFAFC, 0x211A, 0xFB40, 0xFB7E, 0x2146, 0xFB80, 0xFBFC, 0x2185, 0xFC40, 0xFC4B, 0x2202, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp index e243e6a..5303c72 100644 --- a/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_90ms_RKSJ_V_2[78 * 3] = { +namespace fxcmap { + +const uint16_t k90ms_RKSJ_V_2[78 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, 0x8150, 0x8151, 0x1ED1, 0x815B, 0x815D, 0x1ED3, 0x8160, 0x8164, 0x1ED6, 0x8169, 0x817A, 0x1EDB, 0x8181, 0x8181, 0x1EED, 0x81A8, 0x81A8, 0x02E3, @@ -34,3 +36,5 @@ 0x8768, 0x8768, 0x2098, 0x8769, 0x876A, 0x1F0E, 0x876B, 0x876B, 0x209C, 0x876C, 0x876D, 0x1F11, 0x876E, 0x876E, 0x209D, 0x8780, 0x8781, 0x1F14, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp index 7082aaf..a77d0e1 100644 --- a/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_90msp_RKSJ_H_2[170 * 3] = { +namespace fxcmap { + +const uint16_t k90msp_RKSJ_H_2[170 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, 0x8180, 0x81AC, 0x02B8, 0x81B8, 0x81BF, 0x02E5, 0x81C8, 0x81CE, 0x02ED, 0x81DA, 0x81E8, 0x02F4, 0x81F0, 0x81F7, 0x0303, 0x81FC, 0x81FC, 0x030B, @@ -65,3 +67,5 @@ 0xFAD0, 0xFAD0, 0x07C9, 0xFAD1, 0xFAFC, 0x211A, 0xFB40, 0xFB7E, 0x2146, 0xFB80, 0xFBFC, 0x2185, 0xFC40, 0xFC4B, 0x2202, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp index 165b36f..ee2f799 100644 --- a/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_90msp_RKSJ_V_2[78 * 3] = { +namespace fxcmap { + +const uint16_t k90msp_RKSJ_V_2[78 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, 0x8150, 0x8151, 0x1ED1, 0x815B, 0x815D, 0x1ED3, 0x8160, 0x8164, 0x1ED6, 0x8169, 0x817A, 0x1EDB, 0x8181, 0x8181, 0x1EED, 0x81A8, 0x81A8, 0x02E3, @@ -34,3 +36,5 @@ 0x8768, 0x8768, 0x2098, 0x8769, 0x876A, 0x1F0E, 0x876B, 0x876B, 0x209C, 0x876C, 0x876D, 0x1F11, 0x876E, 0x876E, 0x209D, 0x8780, 0x8781, 0x1F14, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp index fca2f57..0bf3f2f 100644 --- a/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_90pv_RKSJ_H_1[263 * 3] = { +namespace fxcmap { + +const uint16_t k90pv_RKSJ_H_1[263 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146, 0x00FD, 0x00FD, 0x0098, 0x00FE, 0x00FE, 0x00E4, 0x00FF, 0x00FF, 0x007C, 0x8140, 0x817E, 0x0279, 0x8180, 0x81AC, 0x02B8, 0x81B8, 0x81BF, 0x02E5, @@ -96,3 +98,5 @@ 0xED83, 0xED83, 0x1EFE, 0xED85, 0xED85, 0x1EFF, 0xED87, 0xED87, 0x1F00, 0xED8E, 0xED8E, 0x1F01, 0xED95, 0xED96, 0x1F02, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp index beab5fa..69af127 100644 --- a/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_Add_RKSJ_H_1[635 * 3] = { +namespace fxcmap { + +const uint16_t kAdd_RKSJ_H_1[635 * 3] = { 0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, 0x8180, 0x81AC, 0x02B8, 0x81B8, 0x81BF, 0x02E5, 0x81C8, 0x81CE, 0x02ED, 0x81DA, 0x81E8, 0x02F4, 0x81F0, 0x81F7, 0x0303, 0x81FC, 0x81FC, 0x030B, @@ -220,3 +222,5 @@ 0xEF52, 0xEF63, 0x1EDB, 0xEF64, 0xEF79, 0x1EEE, 0xEF7A, 0xEF7B, 0x2048, 0xEF8D, 0xEF90, 0x02E0, 0xEF91, 0xEF94, 0x1FF6, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp index a9cdd44..ce351ff 100644 --- a/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_Add_RKSJ_V_1[57 * 3] = { +namespace fxcmap { + +const uint16_t kAdd_RKSJ_V_1[57 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, 0x8150, 0x8151, 0x1ED1, 0x815B, 0x815D, 0x1ED3, 0x8160, 0x8164, 0x1ED6, 0x8165, 0x8165, 0x205A, 0x8166, 0x8166, 0x2053, 0x8167, 0x8167, 0x2058, @@ -27,3 +29,5 @@ 0xEC8D, 0xEC8D, 0x20A6, 0xEC8E, 0xEC8E, 0x20A5, 0xEC8F, 0xEC8F, 0x20A1, 0xEC90, 0xEC90, 0x20A4, 0xEC95, 0xEC95, 0x2084, 0xEF92, 0xEF92, 0x208D, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp b/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp index ef02d78..758bfeb 100644 --- a/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp +++ b/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_Japan1CID2Unicode_4[15444] = { +namespace fxcmap { + +const uint16_t kJapan1CID2Unicode_4[15444] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, @@ -1724,3 +1726,5 @@ 0x440C, 0x3E8A, 0xFFFD, 0xFFFD, 0x4BE8, 0xFFFD, 0x3EDA, 0x3B22, 0xFFFD, 0x457A, 0x4093, 0xFFFD, 0x4665, 0x4103, 0x4293, 0x46AE, 0x3488, 0xFFFD, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp b/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp index 7dc87b8..c4675be 100644 --- a/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/EUC-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_EUC_H_1[120 * 3] = { +namespace fxcmap { + +const uint16_t kEUC_H_1[120 * 3] = { 0x0020, 0x007E, 0x00E7, 0x8EA0, 0x8EDF, 0x0146, 0xA1A1, 0xA1FE, 0x0279, 0xA2A1, 0xA2AE, 0x02D7, 0xA2BA, 0xA2C1, 0x02E5, 0xA2CA, 0xA2D0, 0x02ED, 0xA2DC, 0xA2EA, 0x02F4, 0xA2F2, 0xA2F9, 0x0303, 0xA2FE, 0xA2FE, 0x030B, @@ -48,3 +50,5 @@ 0xF0A1, 0xF0FE, 0x1BBA, 0xF1A1, 0xF1FE, 0x1C18, 0xF2A1, 0xF2FE, 0x1C76, 0xF3A1, 0xF3FE, 0x1CD4, 0xF4A1, 0xF4A4, 0x1D32, 0xF4A5, 0xF4A6, 0x205C, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp b/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp index 05f2b14..c507656 100644 --- a/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/EUC-V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_EUC_V_1[27 * 3] = { +namespace fxcmap { + +const uint16_t kEUC_V_1[27 * 3] = { 0xA1A2, 0xA1A3, 0x1ECF, 0xA1B1, 0xA1B2, 0x1ED1, 0xA1BC, 0xA1BE, 0x1ED3, 0xA1C1, 0xA1C5, 0x1ED6, 0xA1CA, 0xA1DB, 0x1EDB, 0xA1E1, 0xA1E1, 0x1EED, 0xA4A1, 0xA4A1, 0x1EEE, 0xA4A3, 0xA4A3, 0x1EEF, 0xA4A5, 0xA4A5, 0x1EF0, @@ -17,3 +19,5 @@ 0xA5C3, 0xA5C3, 0x1EFD, 0xA5E3, 0xA5E3, 0x1EFE, 0xA5E5, 0xA5E5, 0x1EFF, 0xA5E7, 0xA5E7, 0x1F00, 0xA5EE, 0xA5EE, 0x1F01, 0xA5F5, 0xA5F6, 0x1F02, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp index ec95683..80c0b48 100644 --- a/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_Ext_RKSJ_H_2[665 * 3] = { +namespace fxcmap { + +const uint16_t kExt_RKSJ_H_2[665 * 3] = { 0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, 0x8180, 0x8188, 0x02B8, 0x8189, 0x8189, 0x1D36, 0x818A, 0x81AC, 0x02C2, 0x824F, 0x8258, 0x030C, 0x8260, 0x8279, 0x0316, 0x8281, 0x829A, 0x0330, @@ -230,3 +232,5 @@ 0xEE40, 0xEE7E, 0x2162, 0xEE80, 0xEEEC, 0x21A1, 0xEEEF, 0xEEF8, 0x1F9C, 0xEEF9, 0xEEF9, 0x02EF, 0xEEFA, 0xEEFC, 0x1F45, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp index 6c3f7c6..f3833bc 100644 --- a/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp +++ b/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_Ext_RKSJ_V_2[39 * 3] = { +namespace fxcmap { + +const uint16_t kExt_RKSJ_V_2[39 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, 0x814A, 0x814A, 0x2050, 0x814B, 0x814B, 0x204F, 0x815B, 0x815D, 0x1ED3, 0x8160, 0x8164, 0x1ED6, 0x8165, 0x8165, 0x2059, 0x8166, 0x8166, 0x2054, @@ -21,3 +23,5 @@ 0x8385, 0x8385, 0x1EFF, 0x8387, 0x8387, 0x1F00, 0x838E, 0x838E, 0x1F01, 0x8395, 0x8396, 0x1F02, 0x875F, 0x876E, 0x1F04, 0x8780, 0x8781, 0x1F14, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/H_1.cpp b/core/fpdfapi/cmaps/Japan1/H_1.cpp index 56637b4..be3694d 100644 --- a/core/fpdfapi/cmaps/Japan1/H_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_H_1[118 * 3] = { +namespace fxcmap { + +const uint16_t kH_1[118 * 3] = { 0x2121, 0x217E, 0x0279, 0x2221, 0x222E, 0x02D7, 0x223A, 0x2241, 0x02E5, 0x224A, 0x2250, 0x02ED, 0x225C, 0x226A, 0x02F4, 0x2272, 0x2279, 0x0303, 0x227E, 0x227E, 0x030B, 0x2330, 0x2339, 0x030C, 0x2341, 0x235A, 0x0316, @@ -48,3 +50,5 @@ 0x7221, 0x727E, 0x1C76, 0x7321, 0x737E, 0x1CD4, 0x7421, 0x7424, 0x1D32, 0x7425, 0x7426, 0x205C, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp index b815a9e..aa8565d 100644 --- a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp +++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp
@@ -6,7 +6,11 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_UniJIS_UCS2_HW_H_4[4 * 3] = { +namespace fxcmap { + +const uint16_t kUniJIS_UCS2_HW_H_4[4 * 3] = { 0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, 0x005D, 0x007E, 0x0124, 0x00A5, 0x00A5, 0x0123, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp index 63e6e98..aed1f63 100644 --- a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp +++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_UniJIS_UCS2_HW_V_4[199 * 3] = { +namespace fxcmap { + +const uint16_t kUniJIS_UCS2_HW_V_4[199 * 3] = { 0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, 0x005D, 0x007E, 0x0124, 0x00A5, 0x00A5, 0x0123, 0x00B0, 0x00B0, 0x204D, 0x2010, 0x2010, 0x1ED5, 0x2015, 0x2015, 0x1ED4, 0x2016, 0x2016, 0x1ED7, 0x2018, 0x2019, 0x2059, @@ -75,3 +77,5 @@ 0xFF5C, 0xFF5C, 0x1ED8, 0xFF5D, 0xFF5D, 0x1EE2, 0xFF5E, 0xFF5E, 0x1ED6, 0xFFE3, 0xFFE3, 0x1ED1, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp index eb126d6..5496706 100644 --- a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp +++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_UniJIS_UCS2_H_4[9772 * 2] = { +namespace fxcmap { + +const uint16_t kUniJIS_UCS2_H_4[9772 * 2] = { 0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024, 0x0005, 0x0025, 0x0006, 0x0026, 0x0007, 0x0027, 0x0008, 0x0028, 0x0009, 0x0029, 0x000A, 0x002A, 0x000B, 0x002B, 0x000C, 0x002C, 0x000D, 0x002D, @@ -2180,3 +2182,5 @@ 0xFFE0, 0x02C9, 0xFFE1, 0x02CA, 0xFFE2, 0x02EF, 0xFFE3, 0x0289, 0xFFE4, 0x1F45, 0xFFE5, 0x02C7, 0xFFE8, 0x0143, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp index d29b894..8c2cc89 100644 --- a/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp +++ b/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_UniJIS_UCS2_V_4[251 * 2] = { +namespace fxcmap { + +const uint16_t kUniJIS_UCS2_V_4[251 * 2] = { 0x00B0, 0x204D, 0x2010, 0x1ED5, 0x2015, 0x1ED4, 0x2016, 0x1ED7, 0x2018, 0x2059, 0x2019, 0x205A, 0x201C, 0x2057, 0x201D, 0x2058, 0x2025, 0x1EDA, 0x2026, 0x1ED9, 0x2032, 0x2051, 0x2033, 0x205B, 0x2190, 0x02E2, 0x2191, @@ -64,3 +66,5 @@ 0xFF3B, 0x1EDF, 0xFF3D, 0x1EE0, 0xFF3F, 0x1ED2, 0xFF5B, 0x1EE1, 0xFF5C, 0x1ED8, 0xFF5D, 0x1EE2, 0xFF5E, 0x1ED6, 0xFFE3, 0x1ED1, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/V_1.cpp b/core/fpdfapi/cmaps/Japan1/V_1.cpp index e4fbc4d..8fcc59f 100644 --- a/core/fpdfapi/cmaps/Japan1/V_1.cpp +++ b/core/fpdfapi/cmaps/Japan1/V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Japan1/cmaps_japan1.h" -const uint16_t kFXCMAP_V_1[27 * 3] = { +namespace fxcmap { + +const uint16_t kV_1[27 * 3] = { 0x2122, 0x2123, 0x1ECF, 0x2131, 0x2132, 0x1ED1, 0x213C, 0x213E, 0x1ED3, 0x2141, 0x2145, 0x1ED6, 0x214A, 0x215B, 0x1EDB, 0x2161, 0x2161, 0x1EED, 0x2421, 0x2421, 0x1EEE, 0x2423, 0x2423, 0x1EEF, 0x2425, 0x2425, 0x1EF0, @@ -17,3 +19,5 @@ 0x2543, 0x2543, 0x1EFD, 0x2563, 0x2563, 0x1EFE, 0x2565, 0x2565, 0x1EFF, 0x2567, 0x2567, 0x1F00, 0x256E, 0x256E, 0x1F01, 0x2575, 0x2576, 0x1F02, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp index b6a00c1..8d48f27 100644 --- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp +++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -8,43 +8,31 @@ #include <iterator> -const FXCMAP_CMap kFXCMAP_Japan1_cmaps[] = { - {"83pv-RKSJ-H", kFXCMAP_83pv_RKSJ_H_1, nullptr, 222, 0, FXCMAP_CMap::Range, - 0}, - {"90ms-RKSJ-H", kFXCMAP_90ms_RKSJ_H_2, nullptr, 171, 0, FXCMAP_CMap::Range, - 0}, - {"90ms-RKSJ-V", kFXCMAP_90ms_RKSJ_V_2, nullptr, 78, 0, FXCMAP_CMap::Range, - -1}, - {"90msp-RKSJ-H", kFXCMAP_90msp_RKSJ_H_2, nullptr, 170, 0, - FXCMAP_CMap::Range, -2}, - {"90msp-RKSJ-V", kFXCMAP_90msp_RKSJ_V_2, nullptr, 78, 0, FXCMAP_CMap::Range, - -1}, - {"90pv-RKSJ-H", kFXCMAP_90pv_RKSJ_H_1, nullptr, 263, 0, FXCMAP_CMap::Range, - 0}, - {"Add-RKSJ-H", kFXCMAP_Add_RKSJ_H_1, nullptr, 635, 0, FXCMAP_CMap::Range, - 0}, - {"Add-RKSJ-V", kFXCMAP_Add_RKSJ_V_1, nullptr, 57, 0, FXCMAP_CMap::Range, - -1}, - {"EUC-H", kFXCMAP_EUC_H_1, nullptr, 120, 0, FXCMAP_CMap::Range, 0}, - {"EUC-V", kFXCMAP_EUC_V_1, nullptr, 27, 0, FXCMAP_CMap::Range, -1}, - {"Ext-RKSJ-H", kFXCMAP_Ext_RKSJ_H_2, nullptr, 665, 0, FXCMAP_CMap::Range, - -4}, - {"Ext-RKSJ-V", kFXCMAP_Ext_RKSJ_V_2, nullptr, 39, 0, FXCMAP_CMap::Range, - -1}, - {"H", kFXCMAP_H_1, nullptr, 118, 0, FXCMAP_CMap::Range, 0}, - {"V", kFXCMAP_V_1, nullptr, 27, 0, FXCMAP_CMap::Range, -1}, - {"UniJIS-UCS2-H", kFXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0, - FXCMAP_CMap::Single, 0}, - {"UniJIS-UCS2-V", kFXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0, - FXCMAP_CMap::Single, -1}, - {"UniJIS-UCS2-HW-H", kFXCMAP_UniJIS_UCS2_HW_H_4, nullptr, 4, 0, - FXCMAP_CMap::Range, -2}, - {"UniJIS-UCS2-HW-V", kFXCMAP_UniJIS_UCS2_HW_V_4, nullptr, 199, 0, - FXCMAP_CMap::Range, -1}, - {"UniJIS-UTF16-H", kFXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0, - FXCMAP_CMap::Single, 0}, - {"UniJIS-UTF16-V", kFXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0, - FXCMAP_CMap::Single, -1}, +namespace fxcmap { + +const CMap kJapan1_cmaps[] = { + {"83pv-RKSJ-H", k83pv_RKSJ_H_1, nullptr, 222, 0, CMap::Range, 0}, + {"90ms-RKSJ-H", k90ms_RKSJ_H_2, nullptr, 171, 0, CMap::Range, 0}, + {"90ms-RKSJ-V", k90ms_RKSJ_V_2, nullptr, 78, 0, CMap::Range, -1}, + {"90msp-RKSJ-H", k90msp_RKSJ_H_2, nullptr, 170, 0, CMap::Range, -2}, + {"90msp-RKSJ-V", k90msp_RKSJ_V_2, nullptr, 78, 0, CMap::Range, -1}, + {"90pv-RKSJ-H", k90pv_RKSJ_H_1, nullptr, 263, 0, CMap::Range, 0}, + {"Add-RKSJ-H", kAdd_RKSJ_H_1, nullptr, 635, 0, CMap::Range, 0}, + {"Add-RKSJ-V", kAdd_RKSJ_V_1, nullptr, 57, 0, CMap::Range, -1}, + {"EUC-H", kEUC_H_1, nullptr, 120, 0, CMap::Range, 0}, + {"EUC-V", kEUC_V_1, nullptr, 27, 0, CMap::Range, -1}, + {"Ext-RKSJ-H", kExt_RKSJ_H_2, nullptr, 665, 0, CMap::Range, -4}, + {"Ext-RKSJ-V", kExt_RKSJ_V_2, nullptr, 39, 0, CMap::Range, -1}, + {"H", kH_1, nullptr, 118, 0, CMap::Range, 0}, + {"V", kV_1, nullptr, 27, 0, CMap::Range, -1}, + {"UniJIS-UCS2-H", kUniJIS_UCS2_H_4, nullptr, 9772, 0, CMap::Single, 0}, + {"UniJIS-UCS2-V", kUniJIS_UCS2_V_4, nullptr, 251, 0, CMap::Single, -1}, + {"UniJIS-UCS2-HW-H", kUniJIS_UCS2_HW_H_4, nullptr, 4, 0, CMap::Range, -2}, + {"UniJIS-UCS2-HW-V", kUniJIS_UCS2_HW_V_4, nullptr, 199, 0, CMap::Range, -1}, + {"UniJIS-UTF16-H", kUniJIS_UCS2_H_4, nullptr, 9772, 0, CMap::Single, 0}, + {"UniJIS-UTF16-V", kUniJIS_UCS2_V_4, nullptr, 251, 0, CMap::Single, -1}, }; -const size_t kFXCMAP_Japan1_cmaps_size = std::size(kFXCMAP_Japan1_cmaps); +const size_t kJapan1_cmaps_size = std::size(kJapan1_cmaps); + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h index 04a9fca..45df22d 100644 --- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h +++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.h
@@ -8,32 +8,37 @@ #define CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ #include <stddef.h> +#include <stdint.h> #include "core/fpdfapi/cmaps/fpdf_cmaps.h" -extern const uint16_t kFXCMAP_83pv_RKSJ_H_1[]; -extern const uint16_t kFXCMAP_90ms_RKSJ_H_2[]; -extern const uint16_t kFXCMAP_90ms_RKSJ_V_2[]; -extern const uint16_t kFXCMAP_90msp_RKSJ_H_2[]; -extern const uint16_t kFXCMAP_90msp_RKSJ_V_2[]; -extern const uint16_t kFXCMAP_90pv_RKSJ_H_1[]; -extern const uint16_t kFXCMAP_Add_RKSJ_H_1[]; -extern const uint16_t kFXCMAP_Add_RKSJ_V_1[]; -extern const uint16_t kFXCMAP_EUC_H_1[]; -extern const uint16_t kFXCMAP_EUC_V_1[]; -extern const uint16_t kFXCMAP_Ext_RKSJ_H_2[]; -extern const uint16_t kFXCMAP_Ext_RKSJ_V_2[]; -extern const uint16_t kFXCMAP_H_1[]; -extern const uint16_t kFXCMAP_V_1[]; -extern const uint16_t kFXCMAP_UniJIS_UCS2_H_4[]; -extern const uint16_t kFXCMAP_UniJIS_UCS2_V_4[]; -extern const uint16_t kFXCMAP_UniJIS_UCS2_HW_H_4[]; -extern const uint16_t kFXCMAP_UniJIS_UCS2_HW_V_4[]; -extern const uint16_t kFXCMAP_UniJIS_UTF16_H_0[]; -extern const uint16_t kFXCMAP_UniJIS_UTF16_H_0_DWord[]; -extern const uint16_t kFXCMAP_UniJIS_UTF16_V_0[]; -extern const uint16_t kFXCMAP_Japan1CID2Unicode_4[15444]; -extern const FXCMAP_CMap kFXCMAP_Japan1_cmaps[]; -extern const size_t kFXCMAP_Japan1_cmaps_size; +namespace fxcmap { + +extern const uint16_t k83pv_RKSJ_H_1[]; +extern const uint16_t k90ms_RKSJ_H_2[]; +extern const uint16_t k90ms_RKSJ_V_2[]; +extern const uint16_t k90msp_RKSJ_H_2[]; +extern const uint16_t k90msp_RKSJ_V_2[]; +extern const uint16_t k90pv_RKSJ_H_1[]; +extern const uint16_t kAdd_RKSJ_H_1[]; +extern const uint16_t kAdd_RKSJ_V_1[]; +extern const uint16_t kEUC_H_1[]; +extern const uint16_t kEUC_V_1[]; +extern const uint16_t kExt_RKSJ_H_2[]; +extern const uint16_t kExt_RKSJ_V_2[]; +extern const uint16_t kH_1[]; +extern const uint16_t kV_1[]; +extern const uint16_t kUniJIS_UCS2_H_4[]; +extern const uint16_t kUniJIS_UCS2_V_4[]; +extern const uint16_t kUniJIS_UCS2_HW_H_4[]; +extern const uint16_t kUniJIS_UCS2_HW_V_4[]; +extern const uint16_t kUniJIS_UTF16_H_0[]; +extern const uint16_t kUniJIS_UTF16_H_0_DWord[]; +extern const uint16_t kUniJIS_UTF16_V_0[]; +extern const uint16_t kJapan1CID2Unicode_4[15444]; +extern const CMap kJapan1_cmaps[]; +extern const size_t kJapan1_cmaps_size; + +} // namespace fxcmap #endif // CORE_FPDFAPI_CMAPS_JAPAN1_CMAPS_JAPAN1_H_
diff --git a/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp b/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp index b23488e..e7657cf 100644 --- a/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp +++ b/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_Korea1CID2Unicode_2[18352] = { +namespace fxcmap { + +const uint16_t kKorea1CID2Unicode_2[18352] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, @@ -2048,3 +2050,5 @@ 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x203E, 0x007E, 0x005C, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp b/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp index ac0a373..2ba31b4 100644 --- a/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSC_EUC_H_0[467 * 3] = { +namespace fxcmap { + +const uint16_t kKSC_EUC_H_0[467 * 3] = { 0x0020, 0x007E, 0x1F9E, 0xA1A1, 0xA1FE, 0x0065, 0xA2A1, 0xA2E5, 0x00C3, 0xA3A1, 0xA3FE, 0x0108, 0xA4A1, 0xA4D3, 0x0166, 0xA4D5, 0xA4FE, 0x0199, 0xA5A1, 0xA5AA, 0x01C3, 0xA5B0, 0xA5B9, 0x01CD, 0xA5C1, 0xA5D8, 0x01D7, @@ -164,3 +166,5 @@ 0xFBA1, 0xFBFE, 0x1E5F, 0xFCA1, 0xFCA8, 0x1EBD, 0xFCA9, 0xFCA9, 0x0EE7, 0xFCAA, 0xFCFE, 0x1EC5, 0xFDA1, 0xFDFE, 0x1F1A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp b/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp index adb1ba6..b166075 100644 --- a/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSC_EUC_V_0[16 * 3] = { +namespace fxcmap { + +const uint16_t kKSC_EUC_V_0[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, 0x2080, 0xA1A9, 0xA1AB, 0x1F7B, 0xA1AD, 0xA1AD, 0x1F7E, 0xA1B2, 0xA1BD, 0x1F7F, 0xA1EB, 0xA1EB, 0x1F8B, 0xA3A1, 0xA3A1, 0x1F8C, @@ -14,3 +16,5 @@ 0x1F90, 0xA3BA, 0xA3BF, 0x1F91, 0xA3DB, 0xA3DB, 0x1F97, 0xA3DD, 0xA3DD, 0x1F98, 0xA3DF, 0xA3DF, 0x1F99, 0xA3FB, 0xA3FE, 0x1F9A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp index 1b5c7d0..161198d 100644 --- a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSCms_UHC_HW_H_1[675 * 3] = { +namespace fxcmap { + +const uint16_t kKSCms_UHC_HW_H_1[675 * 3] = { 0x0020, 0x007E, 0x1F9E, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F, 0x8181, 0x81FE, 0x24A9, 0x8241, 0x825A, 0x2527, 0x8261, 0x827A, 0x2541, 0x8281, 0x82FE, 0x255B, 0x8341, 0x835A, 0x25D9, 0x8361, 0x837A, 0x25F3, @@ -233,3 +235,5 @@ 0xFAE7, 0xFAFE, 0x1E47, 0xFBA1, 0xFBFE, 0x1E5F, 0xFCA1, 0xFCA8, 0x1EBD, 0xFCA9, 0xFCA9, 0x0EE7, 0xFCAA, 0xFCFE, 0x1EC5, 0xFDA1, 0xFDFE, 0x1F1A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp index f423978..575a27d 100644 --- a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSCms_UHC_HW_V_1[16 * 3] = { +namespace fxcmap { + +const uint16_t kKSCms_UHC_HW_V_1[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, 0x2080, 0xA1A9, 0xA1AB, 0x1F7B, 0xA1AD, 0xA1AD, 0x1F7E, 0xA1B2, 0xA1BD, 0x1F7F, 0xA1EB, 0xA1EB, 0x1F8B, 0xA3A1, 0xA3A1, 0x1F8C, @@ -14,3 +16,5 @@ 0x1F90, 0xA3BA, 0xA3BF, 0x1F91, 0xA3DB, 0xA3DB, 0x1F97, 0xA3DD, 0xA3DD, 0x1F98, 0xA3DF, 0xA3DF, 0x1F99, 0xA3FB, 0xA3FE, 0x1F9A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp index b2c83c4..7d855c6 100644 --- a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSCms_UHC_H_1[675 * 3] = { +namespace fxcmap { + +const uint16_t kKSCms_UHC_H_1[675 * 3] = { 0x0020, 0x007E, 0x0001, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F, 0x8181, 0x81FE, 0x24A9, 0x8241, 0x825A, 0x2527, 0x8261, 0x827A, 0x2541, 0x8281, 0x82FE, 0x255B, 0x8341, 0x835A, 0x25D9, 0x8361, 0x837A, 0x25F3, @@ -233,3 +235,5 @@ 0xFAE7, 0xFAFE, 0x1E47, 0xFBA1, 0xFBFE, 0x1E5F, 0xFCA1, 0xFCA8, 0x1EBD, 0xFCA9, 0xFCA9, 0x0EE7, 0xFCAA, 0xFCFE, 0x1EC5, 0xFDA1, 0xFDFE, 0x1F1A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp index d09cf5a..7b18417 100644 --- a/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSCms_UHC_V_1[16 * 3] = { +namespace fxcmap { + +const uint16_t kKSCms_UHC_V_1[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, 0x2080, 0xA1A9, 0xA1AB, 0x1F7B, 0xA1AD, 0xA1AD, 0x1F7E, 0xA1B2, 0xA1BD, 0x1F7F, 0xA1EB, 0xA1EB, 0x1F8B, 0xA3A1, 0xA3A1, 0x1F8C, @@ -14,3 +16,5 @@ 0x1F90, 0xA3BA, 0xA3BF, 0x1F91, 0xA3DB, 0xA3DB, 0x1F97, 0xA3DD, 0xA3DD, 0x1F98, 0xA3DF, 0xA3DF, 0x1F99, 0xA3FB, 0xA3FE, 0x1F9A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp b/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp index 35ed080..87e8aa5 100644 --- a/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp +++ b/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_KSCpc_EUC_H_0[509 * 3] = { +namespace fxcmap { + +const uint16_t kKSCpc_EUC_H_0[509 * 3] = { 0x0020, 0x007E, 0x0001, 0x0081, 0x0083, 0x0060, 0x00FE, 0x00FF, 0x0063, 0xA141, 0xA17D, 0x1FFF, 0xA181, 0xA19A, 0x203C, 0xA19C, 0xA1A0, 0x2056, 0xA1A1, 0xA1A1, 0x0065, 0xA1A2, 0xA1A3, 0x205B, 0xA1A4, 0xA1FE, 0x0068, @@ -178,3 +180,5 @@ 0xFBA1, 0xFBFE, 0x1E5F, 0xFCA1, 0xFCA8, 0x1EBD, 0xFCA9, 0xFCA9, 0x0EE7, 0xFCAA, 0xFCFE, 0x1EC5, 0xFDA1, 0xFDFE, 0x1F1A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp index adac315..0d8d3fc 100644 --- a/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_UniKS_UCS2_H_1[8394 * 3] = { +namespace fxcmap { + +const uint16_t kUniKS_UCS2_H_1[8394 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A1, 0x00A1, 0x00D0, 0x00A4, 0x00A4, 0x00D6, 0x00A7, 0x00A7, 0x009B, 0x00A8, 0x00A8, 0x006B, 0x00AA, 0x00AA, 0x029C, 0x00AB, 0x00AB, 0x00B0, 0x00B0, 0x00B0, 0x008A, 0x00B1, 0x00B1, 0x0082, @@ -2806,3 +2808,5 @@ 0xFF5E, 0xFF5E, 0x0071, 0xFFE0, 0xFFE1, 0x008F, 0xFFE2, 0xFFE2, 0x00C2, 0xFFE3, 0xFFE3, 0x0165, 0xFFE5, 0xFFE5, 0x0091, 0xFFE6, 0xFFE6, 0x0143, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp index 0eb93d8..a550b17 100644 --- a/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp +++ b/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_UniKS_UCS2_V_1[18 * 3] = { +namespace fxcmap { + +const uint16_t kUniKS_UCS2_V_1[18 * 3] = { 0x2013, 0x2014, 0x1F7B, 0x2016, 0x2016, 0x1F7D, 0x2025, 0x2025, 0x1F7A, 0x3001, 0x3002, 0x1F78, 0x3008, 0x3011, 0x1F81, 0x3013, 0x3013, 0x1F8B, 0x3014, 0x3015, 0x1F7F, 0xFF01, 0xFF01, 0x1F8C, 0xFF08, 0xFF09, 0x1F8D, @@ -14,3 +16,5 @@ 0xFF3B, 0xFF3B, 0x1F97, 0xFF3D, 0xFF3D, 0x1F98, 0xFF3F, 0xFF3F, 0x1F99, 0xFF5B, 0xFF5D, 0x1F9A, 0xFF5E, 0xFF5E, 0x1F7E, 0xFFE3, 0xFFE3, 0x1F9D, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp b/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp index f8859bd..2d42617 100644 --- a/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp +++ b/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0.cpp
@@ -6,7 +6,9 @@ #include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h" -const uint16_t kFXCMAP_UniKS_UTF16_H_0[158 * 2] = { +namespace fxcmap { + +const uint16_t kUniKS_UTF16_H_0[158 * 2] = { 0x00A9, 0x0062, 0x2010, 0x0061, 0x20A9, 0x0060, 0x2F00, 0x193C, 0x2F04, 0x18EC, 0x2F06, 0x190D, 0x2F08, 0x192B, 0x2F0A, 0x194D, 0x2F0B, 0x1D4B, 0x2F11, 0x10AE, 0x2F12, 0x116A, 0x2F14, 0x143F, 0x2F17, 0x168C, 0x2F18, @@ -44,3 +46,5 @@ 0x2FD0, 0x1466, 0x2FD1, 0x1A7D, 0x2FD2, 0x1CBF, 0x2FD3, 0x11D3, 0x2FD4, 0x0F6A, }; + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp index 513a818..d59c60e 100644 --- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp +++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -8,27 +8,22 @@ #include <iterator> -const FXCMAP_CMap kFXCMAP_Korea1_cmaps[] = { - {"KSC-EUC-H", kFXCMAP_KSC_EUC_H_0, nullptr, 467, 0, FXCMAP_CMap::Range, 0}, - {"KSC-EUC-V", kFXCMAP_KSC_EUC_V_0, nullptr, 16, 0, FXCMAP_CMap::Range, -1}, - {"KSCms-UHC-H", kFXCMAP_KSCms_UHC_H_1, nullptr, 675, 0, FXCMAP_CMap::Range, - -2}, - {"KSCms-UHC-V", kFXCMAP_KSCms_UHC_V_1, nullptr, 16, 0, FXCMAP_CMap::Range, - -1}, - {"KSCms-UHC-HW-H", kFXCMAP_KSCms_UHC_HW_H_1, nullptr, 675, 0, - FXCMAP_CMap::Range, 0}, - {"KSCms-UHC-HW-V", kFXCMAP_KSCms_UHC_HW_V_1, nullptr, 16, 0, - FXCMAP_CMap::Range, -1}, - {"KSCpc-EUC-H", kFXCMAP_KSCpc_EUC_H_0, nullptr, 509, 0, FXCMAP_CMap::Range, - -6}, - {"UniKS-UCS2-H", kFXCMAP_UniKS_UCS2_H_1, nullptr, 8394, 0, - FXCMAP_CMap::Range, 0}, - {"UniKS-UCS2-V", kFXCMAP_UniKS_UCS2_V_1, nullptr, 18, 0, FXCMAP_CMap::Range, - -1}, - {"UniKS-UTF16-H", kFXCMAP_UniKS_UTF16_H_0, nullptr, 158, 0, - FXCMAP_CMap::Single, -2}, - {"UniKS-UTF16-V", kFXCMAP_UniKS_UCS2_V_1, nullptr, 18, 0, - FXCMAP_CMap::Range, -1}, +namespace fxcmap { + +const CMap kKorea1_cmaps[] = { + {"KSC-EUC-H", kKSC_EUC_H_0, nullptr, 467, 0, CMap::Range, 0}, + {"KSC-EUC-V", kKSC_EUC_V_0, nullptr, 16, 0, CMap::Range, -1}, + {"KSCms-UHC-H", kKSCms_UHC_H_1, nullptr, 675, 0, CMap::Range, -2}, + {"KSCms-UHC-V", kKSCms_UHC_V_1, nullptr, 16, 0, CMap::Range, -1}, + {"KSCms-UHC-HW-H", kKSCms_UHC_HW_H_1, nullptr, 675, 0, CMap::Range, 0}, + {"KSCms-UHC-HW-V", kKSCms_UHC_HW_V_1, nullptr, 16, 0, CMap::Range, -1}, + {"KSCpc-EUC-H", kKSCpc_EUC_H_0, nullptr, 509, 0, CMap::Range, -6}, + {"UniKS-UCS2-H", kUniKS_UCS2_H_1, nullptr, 8394, 0, CMap::Range, 0}, + {"UniKS-UCS2-V", kUniKS_UCS2_V_1, nullptr, 18, 0, CMap::Range, -1}, + {"UniKS-UTF16-H", kUniKS_UTF16_H_0, nullptr, 158, 0, CMap::Single, -2}, + {"UniKS-UTF16-V", kUniKS_UCS2_V_1, nullptr, 18, 0, CMap::Range, -1}, }; -const size_t kFXCMAP_Korea1_cmaps_size = std::size(kFXCMAP_Korea1_cmaps); +const size_t kKorea1_cmaps_size = std::size(kKorea1_cmaps); + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h index 3331b4e..f75ded9 100644 --- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h +++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.h
@@ -8,21 +8,26 @@ #define CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_ #include <stddef.h> +#include <stdint.h> #include "core/fpdfapi/cmaps/fpdf_cmaps.h" -extern const uint16_t kFXCMAP_KSC_EUC_H_0[]; -extern const uint16_t kFXCMAP_KSC_EUC_V_0[]; -extern const uint16_t kFXCMAP_KSCms_UHC_H_1[]; -extern const uint16_t kFXCMAP_KSCms_UHC_V_1[]; -extern const uint16_t kFXCMAP_KSCms_UHC_HW_H_1[]; -extern const uint16_t kFXCMAP_KSCms_UHC_HW_V_1[]; -extern const uint16_t kFXCMAP_KSCpc_EUC_H_0[]; -extern const uint16_t kFXCMAP_UniKS_UCS2_H_1[]; -extern const uint16_t kFXCMAP_UniKS_UCS2_V_1[]; -extern const uint16_t kFXCMAP_UniKS_UTF16_H_0[]; -extern const uint16_t kFXCMAP_Korea1CID2Unicode_2[18352]; -extern const FXCMAP_CMap kFXCMAP_Korea1_cmaps[]; -extern const size_t kFXCMAP_Korea1_cmaps_size; +namespace fxcmap { + +extern const uint16_t kKSC_EUC_H_0[]; +extern const uint16_t kKSC_EUC_V_0[]; +extern const uint16_t kKSCms_UHC_H_1[]; +extern const uint16_t kKSCms_UHC_V_1[]; +extern const uint16_t kKSCms_UHC_HW_H_1[]; +extern const uint16_t kKSCms_UHC_HW_V_1[]; +extern const uint16_t kKSCpc_EUC_H_0[]; +extern const uint16_t kUniKS_UCS2_H_1[]; +extern const uint16_t kUniKS_UCS2_V_1[]; +extern const uint16_t kUniKS_UTF16_H_0[]; +extern const uint16_t kKorea1CID2Unicode_2[18352]; +extern const CMap kKorea1_cmaps[]; +extern const size_t kKorea1_cmaps_size; + +} // namespace fxcmap #endif // CORE_FPDFAPI_CMAPS_KOREA1_CMAPS_KOREA1_H_
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp index 89f9a91..e0cb0b5 100644 --- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp +++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -11,6 +11,8 @@ #include "third_party/base/check.h" #include "third_party/base/notreached.h" +namespace fxcmap { + namespace { struct SingleCmap { @@ -24,23 +26,23 @@ uint16_t cid; }; -const FXCMAP_CMap* FindNextCMap(const FXCMAP_CMap* pMap) { +const CMap* FindNextCMap(const CMap* pMap) { return pMap->m_UseOffset ? pMap + pMap->m_UseOffset : nullptr; } } // namespace -uint16_t CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { +uint16_t CIDFromCharCode(const CMap* pMap, uint32_t charcode) { DCHECK(pMap); const uint16_t loword = static_cast<uint16_t>(charcode); if (charcode >> 16) { while (pMap) { if (pMap->m_pDWordMap) { - const FXCMAP_DWordCIDMap* begin = pMap->m_pDWordMap; + const DWordCIDMap* begin = pMap->m_pDWordMap; const auto* end = begin + pMap->m_DWordCount; const auto* found = std::lower_bound( begin, end, charcode, - [](const FXCMAP_DWordCIDMap& element, uint32_t charcode) { + [](const DWordCIDMap& element, uint32_t charcode) { uint16_t hiword = static_cast<uint16_t>(charcode >> 16); if (element.m_HiWord != hiword) return element.m_HiWord < hiword; @@ -58,7 +60,7 @@ while (pMap && pMap->m_pWordMap) { switch (pMap->m_WordMapType) { - case FXCMAP_CMap::Single: { + case CMap::Single: { const auto* begin = reinterpret_cast<const SingleCmap*>(pMap->m_pWordMap); const auto* end = begin + pMap->m_WordCount; @@ -70,7 +72,7 @@ return found->cid; break; } - case FXCMAP_CMap::Range: { + case CMap::Range: { const auto* begin = reinterpret_cast<const RangeCmap*>(pMap->m_pWordMap); const auto* end = begin + pMap->m_WordCount; @@ -93,7 +95,7 @@ return 0; } -uint32_t CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid) { +uint32_t CharCodeFromCID(const CMap* pMap, uint16_t cid) { // TODO(dsinclair): This should be checking both pMap->m_WordMap and // pMap->m_DWordMap. There was a second while() but it was never reached as // the first always returns. Investigate and determine how this should @@ -102,7 +104,7 @@ DCHECK(pMap); while (pMap) { switch (pMap->m_WordMapType) { - case FXCMAP_CMap::Single: { + case CMap::Single: { const auto* pCur = reinterpret_cast<const SingleCmap*>(pMap->m_pWordMap); const auto* pEnd = pCur + pMap->m_WordCount; @@ -113,7 +115,7 @@ } break; } - case FXCMAP_CMap::Range: { + case CMap::Range: { const auto* pCur = reinterpret_cast<const RangeCmap*>(pMap->m_pWordMap); const auto* pEnd = pCur + pMap->m_WordCount; while (pCur < pEnd) { @@ -132,3 +134,5 @@ } return 0; } + +} // namespace fxcmap
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.h b/core/fpdfapi/cmaps/fpdf_cmaps.h index 9d652f1..0881bd1 100644 --- a/core/fpdfapi/cmaps/fpdf_cmaps.h +++ b/core/fpdfapi/cmaps/fpdf_cmaps.h
@@ -9,26 +9,30 @@ #include <stdint.h> -struct FXCMAP_DWordCIDMap { +namespace fxcmap { + +struct DWordCIDMap { uint16_t m_HiWord; uint16_t m_LoWordLow; uint16_t m_LoWordHigh; uint16_t m_CID; }; -struct FXCMAP_CMap { +struct CMap { enum MapType : uint8_t { Single, Range }; - const char* m_Name; // Raw, POD struct. - const uint16_t* m_pWordMap; // Raw, POD struct. - const FXCMAP_DWordCIDMap* m_pDWordMap; // Raw, POD struct. + const char* m_Name; // Raw, POD struct. + const uint16_t* m_pWordMap; // Raw, POD struct. + const DWordCIDMap* m_pDWordMap; // Raw, POD struct. uint16_t m_WordCount; uint16_t m_DWordCount; MapType m_WordMapType; int8_t m_UseOffset; }; -uint16_t CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode); -uint32_t CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid); +uint16_t CIDFromCharCode(const CMap* pMap, uint32_t charcode); +uint32_t CharCodeFromCID(const CMap* pMap, uint16_t cid); + +} // namespace fxcmap #endif // CORE_FPDFAPI_CMAPS_FPDF_CMAPS_H_
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index f4154b7..6e0e665 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -159,13 +159,13 @@ } } -wchar_t EmbeddedUnicodeFromCharcode(const FXCMAP_CMap* pEmbedMap, +wchar_t EmbeddedUnicodeFromCharcode(const fxcmap::CMap* pEmbedMap, CIDSet charset, uint32_t charcode) { if (!IsValidEmbeddedCharcodeFromUnicodeCharset(charset)) return 0; - uint16_t cid = CIDFromCharCode(pEmbedMap, charcode); + uint16_t cid = fxcmap::CIDFromCharCode(pEmbedMap, charcode); if (!cid) return 0; @@ -174,7 +174,7 @@ return cid < map.size() ? map[cid] : 0; } -uint32_t EmbeddedCharcodeFromUnicode(const FXCMAP_CMap* pEmbedMap, +uint32_t EmbeddedCharcodeFromUnicode(const fxcmap::CMap* pEmbedMap, CIDSet charset, wchar_t unicode) { if (!IsValidEmbeddedCharcodeFromUnicodeCharset(charset)) @@ -184,7 +184,7 @@ CPDF_FontGlobals::GetInstance()->GetEmbeddedToUnicode(charset); for (uint32_t i = 0; i < map.size(); ++i) { if (map[i] == unicode) { - uint32_t charCode = CharCodeFromCID(pEmbedMap, i); + uint32_t charCode = fxcmap::CharCodeFromCID(pEmbedMap, i); if (charCode) return charCode; }
diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp index e957992..d5fa61b 100644 --- a/core/fpdfapi/font/cpdf_cmap.cpp +++ b/core/fpdfapi/font/cpdf_cmap.cpp
@@ -280,8 +280,8 @@ return 1; } -const FXCMAP_CMap* FindEmbeddedCMap(pdfium::span<const FXCMAP_CMap> pCMaps, - ByteStringView bsName) { +const fxcmap::CMap* FindEmbeddedCMap(pdfium::span<const fxcmap::CMap> pCMaps, + ByteStringView bsName) { for (size_t i = 0; i < pCMaps.size(); i++) { if (bsName == pCMaps[i].m_Name) return &pCMaps[i]; @@ -337,7 +337,7 @@ return static_cast<uint16_t>(charcode); if (m_pEmbedMap) - return ::CIDFromCharCode(m_pEmbedMap, charcode); + return fxcmap::CIDFromCharCode(m_pEmbedMap, charcode); if (m_DirectCharcodeToCIDTable.empty()) return static_cast<uint16_t>(charcode);
diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h index 8ce745c..cc186e8 100644 --- a/core/fpdfapi/font/cpdf_cmap.h +++ b/core/fpdfapi/font/cpdf_cmap.h
@@ -17,7 +17,9 @@ #include "core/fxcrt/unowned_ptr.h" #include "third_party/base/span.h" -struct FXCMAP_CMap; +namespace fxcmap { +struct CMap; +} enum class CIDCoding : uint8_t { kUNKNOWN = 0, @@ -71,7 +73,7 @@ void SetMixedFourByteLeadingRanges(std::vector<CodeRange> ranges); CIDCoding GetCoding() const { return m_Coding; } - const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap; } + const fxcmap::CMap* GetEmbedMap() const { return m_pEmbedMap; } CIDSet GetCharset() const { return m_Charset; } void SetCharset(CIDSet set) { m_Charset = set; } @@ -96,7 +98,7 @@ std::vector<CodeRange> m_MixedFourByteLeadingRanges; FixedZeroedDataVector<uint16_t> m_DirectCharcodeToCIDTable; std::vector<CIDRange> m_AdditionalCharcodeToCIDMappings; - UnownedPtr<const FXCMAP_CMap> m_pEmbedMap; + UnownedPtr<const fxcmap::CMap> m_pEmbedMap; }; #endif // CORE_FPDFAPI_FONT_CPDF_CMAP_H_
diff --git a/core/fpdfapi/font/cpdf_fontglobals.cpp b/core/fpdfapi/font/cpdf_fontglobals.cpp index dc29806..1aa19d6 100644 --- a/core/fpdfapi/font/cpdf_fontglobals.cpp +++ b/core/fpdfapi/font/cpdf_fontglobals.cpp
@@ -92,29 +92,29 @@ } void CPDF_FontGlobals::LoadEmbeddedGB1CMaps() { - SetEmbeddedCharset( - CIDSET_GB1, pdfium::make_span(kFXCMAP_GB1_cmaps, kFXCMAP_GB1_cmaps_size)); - SetEmbeddedToUnicode(CIDSET_GB1, kFXCMAP_GB1CID2Unicode_5); + SetEmbeddedCharset(CIDSET_GB1, pdfium::make_span(fxcmap::kGB1_cmaps, + fxcmap::kGB1_cmaps_size)); + SetEmbeddedToUnicode(CIDSET_GB1, fxcmap::kGB1CID2Unicode_5); } void CPDF_FontGlobals::LoadEmbeddedCNS1CMaps() { - SetEmbeddedCharset(CIDSET_CNS1, pdfium::make_span(kFXCMAP_CNS1_cmaps, - kFXCMAP_CNS1_cmaps_size)); - SetEmbeddedToUnicode(CIDSET_CNS1, kFXCMAP_CNS1CID2Unicode_5); + SetEmbeddedCharset(CIDSET_CNS1, pdfium::make_span(fxcmap::kCNS1_cmaps, + fxcmap::kCNS1_cmaps_size)); + SetEmbeddedToUnicode(CIDSET_CNS1, fxcmap::kCNS1CID2Unicode_5); } void CPDF_FontGlobals::LoadEmbeddedJapan1CMaps() { SetEmbeddedCharset( CIDSET_JAPAN1, - pdfium::make_span(kFXCMAP_Japan1_cmaps, kFXCMAP_Japan1_cmaps_size)); - SetEmbeddedToUnicode(CIDSET_JAPAN1, kFXCMAP_Japan1CID2Unicode_4); + pdfium::make_span(fxcmap::kJapan1_cmaps, fxcmap::kJapan1_cmaps_size)); + SetEmbeddedToUnicode(CIDSET_JAPAN1, fxcmap::kJapan1CID2Unicode_4); } void CPDF_FontGlobals::LoadEmbeddedKorea1CMaps() { SetEmbeddedCharset( CIDSET_KOREA1, - pdfium::make_span(kFXCMAP_Korea1_cmaps, kFXCMAP_Korea1_cmaps_size)); - SetEmbeddedToUnicode(CIDSET_KOREA1, kFXCMAP_Korea1CID2Unicode_2); + pdfium::make_span(fxcmap::kKorea1_cmaps, fxcmap::kKorea1_cmaps_size)); + SetEmbeddedToUnicode(CIDSET_KOREA1, fxcmap::kKorea1CID2Unicode_2); } RetainPtr<const CPDF_CMap> CPDF_FontGlobals::GetPredefinedCMap(
diff --git a/core/fpdfapi/font/cpdf_fontglobals.h b/core/fpdfapi/font/cpdf_fontglobals.h index a1379a0..6b2e3bc 100644 --- a/core/fpdfapi/font/cpdf_fontglobals.h +++ b/core/fpdfapi/font/cpdf_fontglobals.h
@@ -37,10 +37,10 @@ CFX_FontMapper::StandardFont index, RetainPtr<CPDF_Font> pFont); - void SetEmbeddedCharset(CIDSet idx, pdfium::span<const FXCMAP_CMap> map) { + void SetEmbeddedCharset(CIDSet idx, pdfium::span<const fxcmap::CMap> map) { m_EmbeddedCharsets[idx] = map; } - pdfium::span<const FXCMAP_CMap> GetEmbeddedCharset(CIDSet idx) const { + pdfium::span<const fxcmap::CMap> GetEmbeddedCharset(CIDSet idx) const { return m_EmbeddedCharsets[idx]; } void SetEmbeddedToUnicode(CIDSet idx, pdfium::span<const uint16_t> map) { @@ -64,7 +64,7 @@ std::map<ByteString, RetainPtr<const CPDF_CMap>> m_CMaps; std::unique_ptr<CPDF_CID2UnicodeMap> m_CID2UnicodeMaps[CIDSET_NUM_SETS]; - pdfium::span<const FXCMAP_CMap> m_EmbeddedCharsets[CIDSET_NUM_SETS]; + pdfium::span<const fxcmap::CMap> m_EmbeddedCharsets[CIDSET_NUM_SETS]; pdfium::span<const uint16_t> m_EmbeddedToUnicodes[CIDSET_NUM_SETS]; std::map<UnownedPtr<CPDF_Document>, std::unique_ptr<CFX_StockFontArray>,