From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: Remove FX_WORD in favor of uint16_t. It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 . --- core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp | 4 ++-- core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h | 30 ++++++++++++------------ 14 files changed, 29 insertions(+), 29 deletions(-) (limited to 'core/fpdfapi/fpdf_cmaps/GB1') diff --git a/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp index c6e5752ede..a7468964f9 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GB1CID2Unicode_5[30284] = { +const uint16_t g_FXCMAP_GB1CID2Unicode_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp index 0485aee635..bf4f12f04b 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GB_EUC_H_0[90 * 3] = { +const uint16_t g_FXCMAP_GB_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp index 274d0d2fd2..dd4e0b8742 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GB_EUC_V_0[20 * 3] = { +const uint16_t g_FXCMAP_GB_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp index 7f668947b5..ed68358705 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBK_EUC_H_2[4071 * 3] = { +const uint16_t g_FXCMAP_GBK_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp index ec35055da5..5c993f8b4d 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBK_EUC_V_2[20 * 3] = { +const uint16_t g_FXCMAP_GBK_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp index bd0b1be516..7ad5864c9d 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBK2K_H_5[4071 * 3] = { +const uint16_t g_FXCMAP_GBK2K_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 +1366,7 @@ const FX_WORD g_FXCMAP_GBK2K_H_5[4071 * 3] = { 0xFE40, 0xFE40, 0x1259, 0xFE41, 0xFE7E, 0x5610, 0xFE80, 0xFEA0, 0x564E, }; -const FX_WORD g_FXCMAP_GBK2K_H_5_DWord[1017 * 4] = { +const uint16_t g_FXCMAP_GBK2K_H_5_DWord[1017 * 4] = { 0x8130, 0x8436, 0x8436, 0x5752, 0x8138, 0xFD38, 0xFD39, 0x579C, 0x8138, 0xFE30, 0xFE39, 0x579E, 0x8139, 0x8130, 0x8137, 0x57A8, 0x8139, 0x8139, 0x8139, 0x57B0, 0x8139, 0x8230, 0x8239, 0x57B1, 0x8139, 0x8330, 0x8339, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp index 5e66e43b7e..0445263e02 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBK2K_V_5[41 * 3] = { +const uint16_t g_FXCMAP_GBK2K_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp index 540e7b6c2a..44a5b7f8a1 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBKp_EUC_H_2[4070 * 3] = { +const uint16_t g_FXCMAP_GBKp_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp index 8c8b3d5c92..c9aac3d3ff 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBKp_EUC_V_2[20 * 3] = { +const uint16_t g_FXCMAP_GBKp_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp index 0fab35577c..4553f7ca1e 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBpc_EUC_H_0[91 * 3] = { +const uint16_t g_FXCMAP_GBpc_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp index c07c8a18c0..70cacb5546 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_GBpc_EUC_V_0[20 * 3] = { +const uint16_t g_FXCMAP_GBpc_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp index 60e109f864..e01692f36a 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_UniGB_UCS2_H_4[13825 * 3] = { +const uint16_t g_FXCMAP_UniGB_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp index 5d53067e26..1889171420 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" -const FX_WORD g_FXCMAP_UniGB_UCS2_V_4[24 * 3] = { +const uint16_t g_FXCMAP_UniGB_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, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h index 348783de9d..e80809897d 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h +++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h @@ -7,21 +7,21 @@ #ifndef CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ #define CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ -#include "core/include/fxcrt/fx_system.h" // For FX_WORD. +#include -extern const FX_WORD g_FXCMAP_GB_EUC_H_0[]; -extern const FX_WORD g_FXCMAP_GB_EUC_V_0[]; -extern const FX_WORD g_FXCMAP_GBpc_EUC_H_0[]; -extern const FX_WORD g_FXCMAP_GBpc_EUC_V_0[]; -extern const FX_WORD g_FXCMAP_GBK_EUC_H_2[]; -extern const FX_WORD g_FXCMAP_GBK_EUC_V_2[]; -extern const FX_WORD g_FXCMAP_GBKp_EUC_H_2[]; -extern const FX_WORD g_FXCMAP_GBKp_EUC_V_2[]; -extern const FX_WORD g_FXCMAP_GBK2K_H_5[]; -extern const FX_WORD g_FXCMAP_GBK2K_H_5_DWord[]; -extern const FX_WORD g_FXCMAP_GBK2K_V_5[]; -extern const FX_WORD g_FXCMAP_UniGB_UCS2_H_4[]; -extern const FX_WORD g_FXCMAP_UniGB_UCS2_V_4[]; -extern const FX_WORD g_FXCMAP_GB1CID2Unicode_5[]; +extern const uint16_t g_FXCMAP_GB_EUC_H_0[]; +extern const uint16_t g_FXCMAP_GB_EUC_V_0[]; +extern const uint16_t g_FXCMAP_GBpc_EUC_H_0[]; +extern const uint16_t g_FXCMAP_GBpc_EUC_V_0[]; +extern const uint16_t g_FXCMAP_GBK_EUC_H_2[]; +extern const uint16_t g_FXCMAP_GBK_EUC_V_2[]; +extern const uint16_t g_FXCMAP_GBKp_EUC_H_2[]; +extern const uint16_t g_FXCMAP_GBKp_EUC_V_2[]; +extern const uint16_t g_FXCMAP_GBK2K_H_5[]; +extern const uint16_t g_FXCMAP_GBK2K_H_5_DWord[]; +extern const uint16_t g_FXCMAP_GBK2K_V_5[]; +extern const uint16_t g_FXCMAP_UniGB_UCS2_H_4[]; +extern const uint16_t g_FXCMAP_UniGB_UCS2_V_4[]; +extern const uint16_t g_FXCMAP_GB1CID2Unicode_5[]; #endif // CORE_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ -- cgit v1.2.3