Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fpdftext/fpdf_text.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "txtproc.h"
@@ skipping 57 matching lines @@
         spacew = fontsize_h * pFont->GetCharWidthF(space_charcode) / 1000;
     }
     if (spacew == 0) {
         spacew = fontsize_h / 4;
     }
     if (pText->m_TextState.GetBaselineAngle() != 0) {
         int cc = 0;
         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;
             }
             FX_RECT char_box;
             pFont->GetCharBBox(charcode, char_box);
             FX_FLOAT char_left = pPosArray ? pPosArray[cc * 2] : char_box.left * pText->m_TextState.GetFontSize() / 1000;
             FX_FLOAT char_right = pPosArray ? pPosArray[cc * 2 + 1] : char_box.right * pText->m_TextState.GetFontSize() / 1000;
             FX_FLOAT char_top = char_box.top * pText->m_TextState.GetFontSize() / 1000;
             FX_FLOAT char_bottom = char_box.bottom * pText->m_TextState.GetFontSize() / 1000;
             cc ++;
@@ skipping 17 matching lines @@
     FX_FLOAT baseline = pText->m_PosY;
     CTextBaseLine* pBaseLine = NULL;
     FX_FLOAT topy = pText->m_Top;
     FX_FLOAT bottomy = pText->m_Bottom;
     FX_FLOAT leftx = pText->m_Left;
     int cc = 0;
     CFX_ByteString segment;
     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;
         }
         FX_FLOAT char_left = pPosArray[cc * 2];
         FX_FLOAT char_right = pPosArray[cc * 2 + 1];
         cc ++;
         if (char_left < last_left || (char_left - last_right) > spacew / 2) {
             pBaseLine = InsertTextBox(pBaseLine, baseline, leftx + segment_left, leftx + segment_right,
                                       topy, bottomy, spacew, fontsize_v, segment, pFont);
             segment_left = char_left;
@@ skipping 180 matching lines @@
     if (str.GetLength() <= 0) {
         return;
     }
     CFX_WideString sBuffer;
     IFX_BidiChar* BidiChar = IFX_BidiChar::Create();
     if (NULL == BidiChar)       {
         return;
     }
     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);
             if(!bR2L) {
                 if(ret == 2) {
                     nR2L++;
                 } else if (ret == 1) {
                     nL2R++;
                 }
             }
         }
     }
     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);
         if(!bR2L) {
             if(ret == 2) {
                 nR2L++;
             } else if(ret == 1) {
                 nL2R++;
             }
         }
@@ skipping 431 matching lines @@
 {
     buffer.EstimateSize(0, 10240);
     CPDF_Page page;
     page.Load(pDoc, pPage);
     CPDF_ParseOptions options;
     options.m_bTextOnly = TRUE;
     options.m_bSeparateForm = FALSE;
     page.ParseContent(&options);
     _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }