diff options
| author | thestig <thestig@chromium.org> | 2016-09-26 14:16:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-26 14:16:43 -0700 |
| commit | 2c065322f1b14ca3ff145dc068ab2361704f9e4b (patch) | |
| tree | 92a337f54e0abcc624f28d821ed4533963fd8883 /xfa/fgas/layout/fgas_textbreak.cpp | |
| parent | 5aed0216ad6574944e76a95ef0dbbc910bab4a1a (diff) | |
| download | pdfium-2c065322f1b14ca3ff145dc068ab2361704f9e4b.tar.xz | |
Clean up xfa_fontmgr.cpp.
Review-Url: https://codereview.chromium.org/2362063003
Diffstat (limited to 'xfa/fgas/layout/fgas_textbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 5ee399fead..e10ef01336 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -643,13 +643,15 @@ void CFX_TxtBreak::EndBreak_UpdateArabicShapes() { return; } int32_t& iLineWidth = m_pCurLine->m_iWidth; - CFX_Char *pCur, *pNext; - pCur = m_pCurLine->GetCharPtr(0); + CFX_Char* pCur = m_pCurLine->GetCharPtr(0); FX_BOOL bPrevNum = (pCur->m_dwCharStyles & FX_TXTCHARSTYLE_ArabicIndic) != 0; pCur = m_pCurLine->GetCharPtr(1); FX_WCHAR wch, wForm; FX_BOOL bNextNum; - int32_t i = 1, iCharWidth, iRotation; + int32_t i = 1; + int32_t iCharWidth; + int32_t iRotation; + CFX_Char* pNext; do { i++; if (i < iCount) { @@ -1669,7 +1671,7 @@ int32_t CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun, } if (bCharBBox && !bRet) { int32_t iCharWidth = 1000; - pFont->GetCharWidth(wch, iCharWidth); + pFont->GetCharWidth(wch, iCharWidth, false); FX_FLOAT fRTLeft = 0, fCharWidth = 0; if (iCharWidth > 0) { fCharWidth = iCharWidth * fScale; |