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, 38 insertions, 38 deletions

diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index 17611e774b..603f238706 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -12,46 +12,46 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
-    {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"90ms-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_H_2, 171,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"90ms-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_V_2, 78,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"90msp-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_H_2, 170,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"90msp-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_V_2, 78,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"90pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90pv_RKSJ_H_1, 263,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"Add-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_H_1, 635,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"Add-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_V_1, 57,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"EUC-H", FXCMAP_CMap::Range, g_FXCMAP_EUC_H_1, 120, FXCMAP_CMap::None,
-     nullptr, 0, 0},
-    {"EUC-V", FXCMAP_CMap::Range, g_FXCMAP_EUC_V_1, 27, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"Ext-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_H_2, 665,
-     FXCMAP_CMap::None, nullptr, 0, -4},
-    {"Ext-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_V_2, 39,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"H", FXCMAP_CMap::Range, g_FXCMAP_H_1, 118, FXCMAP_CMap::None, nullptr, 0,
+    {"83pv-RKSJ-H", g_FXCMAP_83pv_RKSJ_H_1, nullptr, 222, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"90ms-RKSJ-H", g_FXCMAP_90ms_RKSJ_H_2, nullptr, 171, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"90ms-RKSJ-V", g_FXCMAP_90ms_RKSJ_V_2, nullptr, 78, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"90msp-RKSJ-H", g_FXCMAP_90msp_RKSJ_H_2, nullptr, 170, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -2},
+    {"90msp-RKSJ-V", g_FXCMAP_90msp_RKSJ_V_2, nullptr, 78, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"90pv-RKSJ-H", g_FXCMAP_90pv_RKSJ_H_1, nullptr, 263, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"Add-RKSJ-H", g_FXCMAP_Add_RKSJ_H_1, nullptr, 635, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"Add-RKSJ-V", g_FXCMAP_Add_RKSJ_V_1, nullptr, 57, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"EUC-H", g_FXCMAP_EUC_H_1, nullptr, 120, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"EUC-V", g_FXCMAP_EUC_V_1, nullptr, 27, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"Ext-RKSJ-H", g_FXCMAP_Ext_RKSJ_H_2, nullptr, 665, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -4},
+    {"Ext-RKSJ-V", g_FXCMAP_Ext_RKSJ_V_2, nullptr, 39, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"H", g_FXCMAP_H_1, nullptr, 118, 0, FXCMAP_CMap::Range, FXCMAP_CMap::None,
      0},
-    {"V", FXCMAP_CMap::Range, g_FXCMAP_V_1, 27, FXCMAP_CMap::None, nullptr, 0,
+    {"V", g_FXCMAP_V_1, nullptr, 27, 0, FXCMAP_CMap::Range, FXCMAP_CMap::None,
      -1},
-    {"UniJIS-UCS2-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniJIS-UCS2-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniJIS-UCS2-HW-H", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_H_4, 4,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"UniJIS-UCS2-HW-V", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_V_4, 199,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniJIS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniJIS-UTF16-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"UniJIS-UCS2-H", g_FXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, 0},
+    {"UniJIS-UCS2-V", g_FXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, -1},
+    {"UniJIS-UCS2-HW-H", g_FXCMAP_UniJIS_UCS2_HW_H_4, nullptr, 4, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -2},
+    {"UniJIS-UCS2-HW-V", g_FXCMAP_UniJIS_UCS2_HW_V_4, nullptr, 199, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniJIS-UTF16-H", g_FXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, 0},
+    {"UniJIS-UTF16-V", g_FXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() {