Make predefined character table slightly smaller.

core/fpdfapi/fpdf_font/font_int.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 #include <map>
@@ skipping 92 matching lines @@
                                 const CFX_ByteStringC& second);
 
   CPDF_CMap* m_pCMap;
   int m_Status;
   int m_CodeSeq;
   FX_DWORD m_CodePoints[4];
   CFX_ArrayTemplate<CMap_CodeRange> m_CodeRanges;
   CFX_ByteString m_Registry, m_Ordering, m_Supplement;
   CFX_ByteString m_LastWord;
 };
-#define CIDCODING_UNKNOWN 0
-#define CIDCODING_GB 1
-#define CIDCODING_BIG5 2
-#define CIDCODING_JIS 3
-#define CIDCODING_KOREA 4
-#define CIDCODING_UCS2 5
-#define CIDCODING_CID 6
-#define CIDCODING_UTF16 7
+
+enum CIDCoding : uint8_t {
+  CIDCODING_UNKNOWN = 0,
+  CIDCODING_GB,
+  CIDCODING_BIG5,
+  CIDCODING_JIS,
+  CIDCODING_KOREA,
+  CIDCODING_UCS2,
+  CIDCODING_CID,
+  CIDCODING_UTF16,
+};
+
 class CPDF_CMap {
  public:
+  enum CodingScheme : uint8_t {
+    OneByte,
+    TwoBytes,
+    MixedTwoBytes,
+    MixedFourBytes
+  };
+
   CPDF_CMap();
   FX_BOOL LoadPredefined(CPDF_CMapManager* pMgr,
                          const FX_CHAR* name,
                          FX_BOOL bPromptCJK);
   FX_BOOL LoadEmbedded(const uint8_t* pData, FX_DWORD dwSize);
   void Release();
   FX_BOOL IsLoaded() const { return m_bLoaded; }
   FX_BOOL IsVertWriting() const { return m_bVertical; }
   uint16_t CIDFromCharCode(FX_DWORD charcode) const;
   FX_DWORD CharCodeFromCID(uint16_t CID) const;
   int GetCharSize(FX_DWORD charcode) const;
   FX_DWORD GetNextChar(const FX_CHAR* pString, int nStrLen, int& offset) const;
   int CountChar(const FX_CHAR* pString, int size) const;
   int AppendChar(FX_CHAR* str, FX_DWORD charcode) const;
-  typedef enum {
-    OneByte,
-    TwoBytes,
-    MixedTwoBytes,
-    MixedFourBytes
-  } CodingScheme;
 
  protected:
   ~CPDF_CMap();
   friend class CPDF_CMapParser;
   friend class CPDF_CMapManager;
   friend class CPDF_CIDFont;
 
- protected:
   CFX_ByteString m_PredefinedCMap;
   FX_BOOL m_bVertical;
   CIDSet m_Charset;
   int m_Coding;
   CodingScheme m_CodingScheme;
   int m_nCodeRanges;
   uint8_t* m_pLeadingBytes;
   uint16_t* m_pMapping;
   uint8_t* m_pAddMapping;
   FX_BOOL m_bLoaded;
@@ skipping 33 matching lines @@
 
   static FX_DWORD StringToCode(const CFX_ByteStringC& str);
   static CFX_WideString StringToWideString(const CFX_ByteStringC& str);
 };
 
 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
                                 const uint16_t*& pMap,
                                 FX_DWORD& count);
 
 #endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_