diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /core/fpdfapi/fpdf_page/cpdf_textobject.cpp | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz | |
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'core/fpdfapi/fpdf_page/cpdf_textobject.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_textobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp index b4161f320e..ef37b30631 100644 --- a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp @@ -35,7 +35,7 @@ void CPDF_TextObject::GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const { 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; @@ -179,7 +179,7 @@ FX_FLOAT CPDF_TextObject::GetCharWidth(FX_DWORD charcode) const { 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; } @@ -240,7 +240,7 @@ void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX, } 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); |