Remove FX_WORD in favor of uint16_t.

core/fpdfapi/fpdf_page/cpdf_textobject.cpp

 // Copyright 2016 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
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_textobject.h"
 
 CPDF_TextObject::CPDF_TextObject()
     : m_PosX(0),
@@ skipping 17 matching lines @@
   if (pInfo->m_CharCode == -1) {
     return;
   }
   CPDF_Font* pFont = m_TextState.GetFont();
   if (!pFont->IsCIDFont()) {
     return;
   }
   if (!pFont->AsCIDFont()->IsVertWriting()) {
     return;
   }
-  FX_WORD CID = pFont->AsCIDFont()->CIDFromCharCode(pInfo->m_CharCode);
+  uint16_t CID = pFont->AsCIDFont()->CIDFromCharCode(pInfo->m_CharCode);
   pInfo->m_OriginY = pInfo->m_OriginX;
   pInfo->m_OriginX = 0;
   short vx, vy;
   pFont->AsCIDFont()->GetVertOrigin(CID, vx, vy);
   FX_FLOAT fontsize = m_TextState.GetFontSize();
   pInfo->m_OriginX -= fontsize * vx / 1000;
   pInfo->m_OriginY -= fontsize * vy / 1000;
 }
 
 int CPDF_TextObject::CountChars() const {
@@ skipping 123 matching lines @@
   FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
   CPDF_Font* pFont = m_TextState.GetFont();
   FX_BOOL bVertWriting = FALSE;
   CPDF_CIDFont* pCIDFont = pFont->AsCIDFont();
   if (pCIDFont) {
     bVertWriting = pCIDFont->IsVertWriting();
   }
   if (!bVertWriting)
     return pFont->GetCharWidthF(charcode, 0) * fontsize;
 
-  FX_WORD CID = pCIDFont->CIDFromCharCode(charcode);
+  uint16_t CID = pCIDFont->CIDFromCharCode(charcode);
   return pCIDFont->GetVertWidth(CID) * fontsize;
 }
 
 void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX,
                                        FX_FLOAT* pTextAdvanceY,
                                        FX_FLOAT horz_scale,
                                        int level) {
   FX_FLOAT curpos = 0;
   FX_FLOAT min_x = 10000 * 1.0f;
   FX_FLOAT max_x = -10000 * 1.0f;
@@ skipping 40 matching lines @@
         max_x = char_left;
       }
       if (min_x > char_right) {
         min_x = char_right;
       }
       if (max_x < char_right) {
         max_x = char_right;
       }
       charwidth = pFont->GetCharWidthF(charcode, level) * fontsize / 1000;
     } else {
-      FX_WORD CID = pCIDFont->CIDFromCharCode(charcode);
+      uint16_t CID = pCIDFont->CIDFromCharCode(charcode);
       short vx;
       short vy;
       pCIDFont->GetVertOrigin(CID, vx, vy);
       char_rect.left -= vx;
       char_rect.right -= vx;
       char_rect.top -= vy;
       char_rect.bottom -= vy;
       if (min_x > char_rect.left) {
         min_x = (FX_FLOAT)char_rect.left;
       }
@@ skipping 82 matching lines @@
 void CPDF_TextObject::SetPosition(FX_FLOAT x, FX_FLOAT y) {
   FX_FLOAT dx = x - m_PosX;
   FX_FLOAT dy = y - m_PosY;
   m_PosX = x;
   m_PosY = y;
   m_Left += dx;
   m_Right += dx;
   m_Top += dy;
   m_Bottom += dy;
 }