diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /core/src/fpdftext/fpdf_text.cpp | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'core/src/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index c391524b9e..5efbe51c03 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -75,7 +75,7 @@ void CTextPage::ProcessObject(CPDF_PageObject* pObject) CFX_AffineMatrix matrix; pText->GetTextMatrix(&matrix); for (int i = 0; i < pText->m_nChars; i ++) { - FX_DWORD charcode = pText->m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)pText->m_pCharCodes : pText->m_pCharCodes[i]; + FX_DWORD charcode = pText->m_nChars == 1 ? (FX_DWORD)(uintptr_t)pText->m_pCharCodes : pText->m_pCharCodes[i]; if (charcode == (FX_DWORD) - 1) { continue; } @@ -113,7 +113,7 @@ void CTextPage::ProcessObject(CPDF_PageObject* pObject) int space_count = 0; FX_FLOAT last_left = 0, last_right = 0, segment_left = 0, segment_right = 0; for (int i = 0; i < pText->m_nChars; i ++) { - FX_DWORD charcode = pText->m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)pText->m_pCharCodes : pText->m_pCharCodes[i]; + FX_DWORD charcode = pText->m_nChars == 1 ? (FX_DWORD)(uintptr_t)pText->m_pCharCodes : pText->m_pCharCodes[i]; if (charcode == (FX_DWORD) - 1) { continue; } @@ -314,11 +314,11 @@ void NormalizeString(CFX_WideString& str) } CFX_WordArray order; FX_BOOL bR2L = FALSE; - FX_INT32 start = 0, count = 0, i = 0; + int32_t start = 0, count = 0, i = 0; int nR2L = 0, nL2R = 0; for (i = 0; i < str.GetLength(); i++) { if(BidiChar->AppendChar(str.GetAt(i))) { - FX_INT32 ret = BidiChar->GetBidiInfo(start, count); + int32_t ret = BidiChar->GetBidiInfo(start, count); order.Add(start); order.Add(count); order.Add(ret); @@ -332,7 +332,7 @@ void NormalizeString(CFX_WideString& str) } } if(BidiChar->EndChar()) { - FX_INT32 ret = BidiChar->GetBidiInfo(start, count); + int32_t ret = BidiChar->GetBidiInfo(start, count); order.Add(start); order.Add(count); order.Add(ret); |