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

core/src/fpdfapi/fpdf_page/fpdf_page.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_module.h"
 #include "pageint.h"
 CPDF_PageObject* CPDF_PageObject::Create(int type)
@@ skipping 95 matching lines @@
 {
     if (m_nChars > 1 && m_pCharCodes) {
         FX_Free(m_pCharCodes);
     }
     if (m_pCharPos) {
         FX_Free(m_pCharPos);
     }
 }
 void CPDF_TextObject::GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const
 {
-    pInfo->m_CharCode = m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)m_pCharCodes : m_pCharCodes[index];
+    pInfo->m_CharCode = m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[index];
     pInfo->m_OriginX = index ? m_pCharPos[index - 1] : 0;
     pInfo->m_OriginY = 0;
     if (pInfo->m_CharCode == -1) {
         return;
     }
     CPDF_Font* pFont = m_TextState.GetFont();
     if (pFont->GetFontType() != PDFFONT_CIDFONT) {
         return;
     }
     if (!((CPDF_CIDFont*)pFont)->IsVertWriting()) {
@@ skipping 16 matching lines @@
     int count = 0;
     for (int i = 0; i < m_nChars; i ++)
         if (m_pCharCodes[i] != (FX_DWORD) - 1) {
             count ++;
         }
     return count;
 }
 void CPDF_TextObject::GetCharInfo(int index, FX_DWORD& charcode, FX_FLOAT& kerning) const
 {
     if (m_nChars == 1) {
-        charcode = (FX_DWORD)(FX_UINTPTR)m_pCharCodes;
+        charcode = (FX_DWORD)(uintptr_t)m_pCharCodes;
         kerning = 0;
         return;
     }
     int count = 0;
     for (int i = 0; i < m_nChars; i ++) {
         if (m_pCharCodes[i] != (FX_DWORD) - 1) {
             if (count == index) {
                 charcode = m_pCharCodes[i];
                 if (i == m_nChars - 1 || m_pCharCodes[i + 1] != (FX_DWORD) - 1) {
                     kerning = 0;
@@ skipping 83 matching lines @@
             while (offset < len) {
                 m_pCharCodes[index++] = pFont->GetNextChar(segment, len, offset);
             }
             if (i != nsegs - 1) {
                 m_pCharPos[index - 1] = pKerning[i];
                 m_pCharCodes[index ++] = (FX_DWORD) - 1;
             }
         }
     } else {
         int offset = 0;
-        m_pCharCodes = (FX_DWORD*)(FX_UINTPTR)pFont->GetNextChar(pStrs[0], pStrs[0].GetLength(), offset);
+        m_pCharCodes = (FX_DWORD*)(uintptr_t)pFont->GetNextChar(pStrs[0], pStrs[0].GetLength(), offset);
     }
 }
 void CPDF_TextObject::SetText(const CFX_ByteString& str)
 {
     SetSegments(&str, NULL, 1);
     RecalcPositionData();
 }
 void CPDF_TextObject::SetEmpty()
 {
     if (m_nChars > 1 && m_pCharCodes) {
@@ skipping 36 matching lines @@
         int index = 0;
         for (int i = 0; i < nChars; i ++) {
             m_pCharCodes[index++] = pCharCodes[i];
             if (pKernings[i] != 0 && i != nChars - 1) {
                 m_pCharCodes[index] = (FX_DWORD) - 1;
                 m_pCharPos[index - 1] = pKernings[i];
                 index ++;
             }
         }
     } else {
-        m_pCharCodes = (FX_DWORD*)(FX_UINTPTR)pCharCodes[0];
+        m_pCharCodes = (FX_DWORD*)(uintptr_t)pCharCodes[0];
     }
     RecalcPositionData();
 }
 FX_FLOAT CPDF_TextObject::GetCharWidth(FX_DWORD charcode) const
 {
     FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
     CPDF_Font* pFont = m_TextState.GetFont();
     FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
@@ skipping 28 matching lines @@
 {
     CPDF_Font* pFont = m_TextState.GetFont();
     FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
     int count = 0;
     for (int i = 0; i < m_nChars; i ++) {
-        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)m_pCharCodes : m_pCharCodes[i];
+        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
             continue;
         }
         if( count != index) {
             count++;
             continue;
         }
         FX_FLOAT curpos = i > 0 ? m_pCharPos[i - 1] : 0;
         FX_RECT char_rect;
         pFont->GetCharBBox(charcode, char_rect, 0);
@@ skipping 23 matching lines @@
     FX_FLOAT curpos = 0;
     FX_FLOAT min_x = 10000 * 1.0f, max_x = -10000 * 1.0f, min_y = 10000 * 1.0f, max_y = -10000 * 1.0f;
     CPDF_Font* pFont = m_TextState.GetFont();
     FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize();
     for (int i = 0; i < m_nChars; i ++) {
-        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)m_pCharCodes : m_pCharCodes[i];
+        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
             curpos -= FXSYS_Mul(m_pCharPos[i - 1], fontsize) / 1000;
             continue;
         }
         if (i) {
             m_pCharPos[i - 1] = curpos;
         }
         FX_RECT char_rect;
         pFont->GetCharBBox(charcode, char_rect, level);
         FX_FLOAT charwidth;
@@ skipping 106 matching lines @@
 {
     CPDF_Font* pFont = m_TextState.GetFont();
     FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize();
     int index = 0;
     for (int i = 0; i < m_nChars; i ++) {
-        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(FX_UINTPTR)m_pCharCodes : m_pCharCodes[i];
+        FX_DWORD charcode = m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
             continue;
         }
         pPosArray[index++] = i ? m_pCharPos[i - 1] : 0;
         FX_FLOAT charwidth;
         if (bVertWriting) {
             FX_WORD CID = pCIDFont->CIDFromCharCode(charcode);
             charwidth = pCIDFont->GetVertWidth(CID) * fontsize / 1000;
         } else {
             charwidth = pFont->GetCharWidthF(charcode) * fontsize / 1000;
@@ skipping 31 matching lines @@
 void CPDF_TextObject::SetData(int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos, FX_FLOAT x, FX_FLOAT y)
 {
     ASSERT(m_nChars == 0);
     m_nChars = nChars;
     m_PosX = x;
     m_PosY = y;
     if (nChars == 0) {
         return;
     }
     if (nChars == 1) {
-        m_pCharCodes = (FX_DWORD*)(FX_UINTPTR) * pCharCodes;
+        m_pCharCodes = (FX_DWORD*)(uintptr_t) * pCharCodes;
     } else {
         m_pCharCodes = FX_Alloc(FX_DWORD, nChars);
         FXSYS_memcpy32(m_pCharCodes, pCharCodes, sizeof(FX_DWORD)*nChars);
         m_pCharPos = FX_Alloc(FX_FLOAT, nChars - 1);
         FXSYS_memcpy32(m_pCharPos, pCharPos, sizeof(FX_FLOAT) * (nChars - 1));
     }
     RecalcPositionData();
 }
 void CPDF_TextObject::SetTextState(CPDF_TextState TextState)
 {
@@ skipping 424 matching lines @@
     matrix = m_PageMatrix;
     matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions()
 {
     m_bTextOnly = FALSE;
     m_bMarkedContent = TRUE;
     m_bSeparateForm = TRUE;
     m_bDecodeInlineImage = FALSE;
 }