Pack struct FXCMAP_CMap more densely to save 1 KB.

Change-Id: Ida9738f4ad7ef266c2edb794f12dcf49b64fc590
Reviewed-on: https://pdfium-review.googlesource.com/17750
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

1 files changed, 28 insertions, 28 deletions

diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index a91da32369..f0e5992a6a 100644
--- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -12,34 +12,34 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
-    {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
-     nullptr, 0, 0},
-    {"GB-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_V_0, 20, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"GBpc-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_H_0, 91,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"GBpc-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_V_0, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBK-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_H_2, 4071,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"GBK-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_V_2, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBKp-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_H_2, 4070,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"GBKp-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_V_2, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBK2K-H", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_H_5, 4071,
-     FXCMAP_CMap::Single, g_FXCMAP_GBK2K_H_5_DWord, 1017, -4},
-    {"GBK2K-V", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_V_5, 41, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"UniGB-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniGB-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniGB-UTF16-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniGB-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"GB-EUC-H", g_FXCMAP_GB_EUC_H_0, nullptr, 90, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GB-EUC-V", g_FXCMAP_GB_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBpc-EUC-H", g_FXCMAP_GBpc_EUC_H_0, nullptr, 91, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GBpc-EUC-V", g_FXCMAP_GBpc_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBK-EUC-H", g_FXCMAP_GBK_EUC_H_2, nullptr, 4071, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GBK-EUC-V", g_FXCMAP_GBK_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBKp-EUC-H", g_FXCMAP_GBKp_EUC_H_2, nullptr, 4070, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -2},
+    {"GBKp-EUC-V", g_FXCMAP_GBKp_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBK2K-H", g_FXCMAP_GBK2K_H_5, g_FXCMAP_GBK2K_H_5_DWord, 4071, 1017,
+     FXCMAP_CMap::Range, FXCMAP_CMap::Single, -4},
+    {"GBK2K-V", g_FXCMAP_GBK2K_V_5, nullptr, 41, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"UniGB-UCS2-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniGB-UCS2-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniGB-UTF16-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniGB-UTF16-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedGB1CMaps() {