diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-14 17:06:23 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-14 17:06:23 -0700 |
commit | 759247991b5f1df71335294e6bfe3e3fe7aec7b4 (patch) | |
tree | 3de1b72b34c3eae83f4b9fa58e978a643ff0bf6a /core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp | |
parent | dacc22cdfea727a04bce086d9bfec9a4d1a29bd4 (diff) | |
download | pdfium-759247991b5f1df71335294e6bfe3e3fe7aec7b4.tar.xz |
Move extern cmap declarations from .cpp files into new .h files.
That way, the compiler can check them against the definitions rather
than just relying on the linker to line things up.
Make the types of the declarations and definitions match exactly,
instead of being synonym typedefs of each other.
Fix some IWYU and use FX_ArraySize where possible.
BUG=https://code.google.com/p/pdfium/issues/detail?id=178
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1221503005 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp index 0e16d54677..01555a64da 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -extern const unsigned short g_FXCMAP_GBK2K_H_5[4071 * 3] = { +#include "cmaps_gb1.h" + +const FX_WORD 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, @@ -1363,7 +1365,8 @@ extern const unsigned short g_FXCMAP_GBK2K_H_5[4071 * 3] = { 0xFD9E, 0xFD9E, 0x40D3, 0xFD9F, 0xFD9F, 0x200C, 0xFDA0, 0xFDA0, 0x5083, 0xFE40, 0xFE40, 0x1259, 0xFE41, 0xFE7E, 0x5610, 0xFE80, 0xFEA0, 0x564E, }; -extern const unsigned short g_FXCMAP_GBK2K_H_5_DWord[1017 * 4] = { + +const FX_WORD 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, 0x57BB, 0x8139, 0x8430, 0x8439, 0x57C5, 0x8139, 0x8530, 0x8539, 0x57CF, |