| Index: core/fpdfapi/fpdf_page/cpdf_textobject.cpp
|
| diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
|
| index b4161f320e2da7c649fcc3203cb53822326222c6..ef37b30631c0f50cfc7b43ff2ba01c93908eafc2 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);
|
|
|