Fix a bunch of sign mismatch warnings.

core/include/fpdfapi/fpdf_resource.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_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
 #include "../fxcrt/fx_system.h"
@@ skipping 396 matching lines @@
   void LoadGlyphMap() override {}
 
   int m_CharWidthL[256];
   CPDF_Dictionary* m_pCharProcs;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pFontResources;
   CFX_MapPtrToPtr m_CacheMap;
   CFX_MapPtrToPtr m_DeletedMap;
 };
 
-#define CIDSET_UNKNOWN 0
-#define CIDSET_GB1 1
-#define CIDSET_CNS1 2
-#define CIDSET_JAPAN1 3
-#define CIDSET_KOREA1 4
-#define CIDSET_UNICODE 5
-#define NUMBER_OF_CIDSETS 6
+enum CIDSet {
+  CIDSET_UNKNOWN,
+  CIDSET_GB1,
+  CIDSET_CNS1,
+  CIDSET_JAPAN1,
+  CIDSET_KOREA1,
+  CIDSET_UNICODE,
+  CIDSET_NUM_SETS
+};
 
 class CPDF_CIDFont : public CPDF_Font {
  public:
   CPDF_CIDFont();
 
   ~CPDF_CIDFont() override;
 
+  static FX_FLOAT CIDTransformToFloat(uint8_t ch);
+
   FX_BOOL LoadGB2312();
   int GlyphFromCharCode(FX_DWORD charcode, FX_BOOL* pVertGlyph = NULL) override;
   int GetCharWidthF(FX_DWORD charcode, int level = 0) override;
   void GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0) override;
   FX_WORD CIDFromCharCode(FX_DWORD charcode) const;
 
   FX_BOOL IsTrueType() const { return !m_bType1; }
 
   virtual FX_DWORD GetNextChar(const FX_CHAR* pString,
                                int nStrLen,
                                int& offset) const override;
   int CountChar(const FX_CHAR* pString, int size) const override;
   int AppendChar(FX_CHAR* str, FX_DWORD charcode) const override;
   int GetCharSize(FX_DWORD charcode) const override;
-
-  int GetCharset() const { return m_Charset; }
-
   const uint8_t* GetCIDTransform(FX_WORD CID) const;
   FX_BOOL IsVertWriting() const override;
   short GetVertWidth(FX_WORD CID) const;
   void GetVertOrigin(FX_WORD CID, short& vx, short& vy) const;
   FX_BOOL IsUnicodeCompatible() const override;
   virtual FX_BOOL IsFontStyleFromCharCode(FX_DWORD charcode) const;
 
  protected:
   friend class CPDF_Font;
 
   FX_BOOL _Load() override;
   FX_WCHAR _UnicodeFromCharCode(FX_DWORD charcode) const override;
   FX_DWORD _CharCodeFromUnicode(FX_WCHAR Unicode) const override;
   int GetGlyphIndex(FX_DWORD unicodeb, FX_BOOL* pVertGlyph);
   void LoadMetricsArray(CPDF_Array* pArray,
                         CFX_DWordArray& result,
                         int nElements);
   void LoadSubstFont();
 
   CPDF_CMap* m_pCMap;
   CPDF_CMap* m_pAllocatedCMap;
   CPDF_CID2UnicodeMap* m_pCID2UnicodeMap;
-  int m_Charset;
+  CIDSet m_Charset;
   FX_BOOL m_bType1;
   CPDF_StreamAcc* m_pCIDToGIDMap;
   FX_BOOL m_bCIDIsGID;
   FX_WORD m_DefaultWidth;
   FX_WORD* m_pAnsiWidths;
   FX_SMALL_RECT m_CharBBox[256];
   CFX_DWordArray m_WidthList;
   short m_DefaultVY;
   short m_DefaultW1;
   CFX_DWordArray m_VertMetrics;
@@ skipping 352 matching lines @@
 
   FX_BOOL m_bInterpolate;
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pOC;
   CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_