diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-04-30 21:54:13 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-30 21:54:13 +0000 |
| commit | 3d3c2dea9fcb7372e195f453a5e4ec3fd47392b9 (patch) | |
| tree | 443142fe49a3c509d7664b8c3a4b2901278f6066 /xfa/fgas/layout/cfx_rtfbreak.cpp | |
| parent | 39e7e610d8d697f05134890446caf4101539a032 (diff) | |
| download | pdfium-chromium/3416.tar.xz | |
Change out parameter of CFGAS_GEFont::GetCharWidth to pointer.chromium/3416
Change-Id: I1e04c7645b2238d292a6a8eb5fb5fa365fa958f5
Reviewed-on: https://pdfium-review.googlesource.com/31752
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fgas/layout/cfx_rtfbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index 9497e5fde6..1e7587a16e 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -122,7 +122,7 @@ CFX_BreakType CFX_RTFBreak::AppendChar(wchar_t wch) { void CFX_RTFBreak::AppendChar_Combination(CFX_Char* pCurChar) { int32_t iCharWidth = 0; - if (!m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth)) + if (!m_pFont->GetCharWidth(pCurChar->char_code(), &iCharWidth)) iCharWidth = 0; iCharWidth *= m_iFontSize; @@ -191,8 +191,8 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Arabic(CFX_Char* pCurChar) { wForm = pdfium::arabic::GetFormChar(pLastChar, pPrevChar, pCurChar); bAlef = (wForm == 0xFEFF && pLastChar->GetCharType() == FX_CHARTYPE_ArabicAlef); - if (!m_pFont->GetCharWidth(wForm, iCharWidth) && - !m_pFont->GetCharWidth(pLastChar->char_code(), iCharWidth)) { + if (!m_pFont->GetCharWidth(wForm, &iCharWidth) && + !m_pFont->GetCharWidth(pLastChar->char_code(), &iCharWidth)) { iCharWidth = m_iDefChar; } @@ -206,8 +206,8 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Arabic(CFX_Char* pCurChar) { wForm = pdfium::arabic::GetFormChar(pCurChar, bAlef ? nullptr : pLastChar, nullptr); - if (!m_pFont->GetCharWidth(wForm, iCharWidth) && - !m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth)) { + if (!m_pFont->GetCharWidth(wForm, &iCharWidth) && + !m_pFont->GetCharWidth(pCurChar->char_code(), &iCharWidth)) { iCharWidth = m_iDefChar; } @@ -226,7 +226,7 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Others(CFX_Char* pCurChar) { FX_CHARTYPE chartype = pCurChar->GetCharType(); wchar_t wForm = pCurChar->char_code(); int32_t iCharWidth = 0; - if (!m_pFont->GetCharWidth(wForm, iCharWidth)) + if (!m_pFont->GetCharWidth(wForm, &iCharWidth)) iCharWidth = m_iDefChar; iCharWidth *= m_iFontSize; |