Simplify some CMap code.

Change-Id: Ie7eb2605a789d2c841cb1dc123509f473c4c5a5e
Reviewed-on: https://pdfium-review.googlesource.com/17410
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/core/fpdfapi/cmaps/cmap_int.h b/core/fpdfapi/cmaps/cmap_int.h
index e661792843..15e153114e 100644
--- a/core/fpdfapi/cmaps/cmap_int.h
+++ b/core/fpdfapi/cmaps/cmap_int.h
@@ -11,22 +11,21 @@
 #include "core/fxcrt/fx_system.h"
 
 struct FXCMAP_CMap {
-  enum MapType { None, Single, Range, Reverse };
+  enum MapType { None, Single, Range };
 
   const char* m_Name;
   MapType m_WordMapType;
   const uint16_t* m_pWordMap;
-  int m_WordCount;
+  uint16_t m_WordCount;
   MapType m_DWordMapType;
   const uint16_t* m_pDWordMap;
-  int m_DWordCount;
-  int m_UseOffset;
+  uint16_t m_DWordCount;
+  int8_t m_UseOffset;
 };
 
-void FPDFAPI_FindEmbeddedCMap(const ByteString& name,
-                              int charset,
-                              int coding,
-                              const FXCMAP_CMap*& pMap);
+const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& name,
+                                            int charset,
+                                            int coding);
 uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode);
 uint32_t FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid);