Remove FX_WORD in favor of uint16_t.

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 <map>
@@ skipping 29 matching lines @@
 typedef struct FT_FaceRec_* FXFT_Face;
 
 FX_WCHAR PDF_UnicodeFromAdobeName(const FX_CHAR* name);
 CFX_ByteString PDF_AdobeNameFromUnicode(FX_WCHAR unicode);
 const FX_CHAR* FCS_GetAltStr(FX_WCHAR unicode);
 const FX_CHAR* PDF_CharNameFromPredefinedCharSet(int encoding,
                                                  uint8_t charcode);
 
 FX_WCHAR FT_UnicodeFromCharCode(int encoding, FX_DWORD charcode);
 FX_DWORD FT_CharCodeFromUnicode(int encoding, FX_WCHAR unicode);
-const FX_WORD* PDF_UnicodesForPredefinedCharSet(int encoding);
+const uint16_t* PDF_UnicodesForPredefinedCharSet(int encoding);
 const FX_CHAR* GetAdobeCharName(int iBaseEncoding,
                                 const CFX_ByteString* pCharNames,
                                 int charcode);
 
 template <class T>
 class CPDF_CountedObject {
  public:
   explicit CPDF_CountedObject(T* ptr) : m_nCount(1), m_pObj(ptr) {}
   void reset(T* ptr) {  // CAUTION: tosses prior ref counts.
     m_nCount = 1;
@@ skipping 175 matching lines @@
 
  protected:
   virtual void LoadGlyphMap() = 0;
 
   FX_BOOL LoadCommon();
   void LoadSubstFont();
   void LoadFaceMetrics();
   void LoadCharMetrics(int charcode);
 
   CPDF_FontEncoding m_Encoding;
-  FX_WORD m_GlyphIndex[256];
-  FX_WORD m_ExtGID[256];
+  uint16_t m_GlyphIndex[256];
+  uint16_t m_ExtGID[256];
   CFX_ByteString* m_pCharNames;
   int m_BaseEncoding;
-  FX_WORD m_CharWidth[256];
+  uint16_t m_CharWidth[256];
   FX_SMALL_RECT m_CharBBox[256];
   FX_BOOL m_bUseFontWidth;
 };
 
 class CPDF_Type1Font : public CPDF_SimpleFont {
  public:
   CPDF_Type1Font();
 
   // CPDF_Font:
   bool IsType1Font() const override;
@@ skipping 113 matching lines @@
   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;
   FX_BOOL IsVertWriting() const override;
   FX_BOOL IsUnicodeCompatible() const override;
   FX_BOOL Load() override;
   CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const override;
   FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const override;
 
   FX_BOOL LoadGB2312();
-  FX_WORD CIDFromCharCode(FX_DWORD charcode) const;
-  const uint8_t* GetCIDTransform(FX_WORD CID) const;
-  short GetVertWidth(FX_WORD CID) const;
-  void GetVertOrigin(FX_WORD CID, short& vx, short& vy) const;
+  uint16_t CIDFromCharCode(FX_DWORD charcode) const;
+  const uint8_t* GetCIDTransform(uint16_t CID) const;
+  short GetVertWidth(uint16_t CID) const;
+  void GetVertOrigin(uint16_t CID, short& vx, short& vy) const;
   virtual FX_BOOL IsFontStyleFromCharCode(FX_DWORD charcode) const;
 
  protected:
   int GetGlyphIndex(FX_DWORD unicodeb, FX_BOOL* pVertGlyph);
   void LoadMetricsArray(CPDF_Array* pArray,
                         CFX_DWordArray& result,
                         int nElements);
   void LoadSubstFont();
   FX_WCHAR GetUnicodeFromCharCode(FX_DWORD charcode) const;
 
   CPDF_CMap* m_pCMap;
   CPDF_CMap* m_pAllocatedCMap;
   CPDF_CID2UnicodeMap* m_pCID2UnicodeMap;
   CIDSet m_Charset;
   FX_BOOL m_bType1;
   CPDF_StreamAcc* m_pCIDToGIDMap;
   FX_BOOL m_bCIDIsGID;
-  FX_WORD m_DefaultWidth;
-  FX_WORD* m_pAnsiWidths;
+  uint16_t m_DefaultWidth;
+  uint16_t* m_pAnsiWidths;
   FX_SMALL_RECT m_CharBBox[256];
   CFX_DWordArray m_WidthList;
   short m_DefaultVY;
   short m_DefaultW1;
   CFX_DWordArray m_VertMetrics;
   FX_BOOL m_bAdobeCourierStd;
   CFX_CTTGSUBTable* m_pTTGSUBTable;
 };
 
 #define PDFCS_DEVICEGRAY 1
@@ skipping 348 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_