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

fpdfsdk/src/fpdfppo.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 "../../public/fpdf_ppo.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 
@@ skipping 161 matching lines @@
                         pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Rotate");
                         if(pInheritable) 
                                 pCurPageDict->SetAt("Rotate", pInheritable->Clone());
                 }
 
                 /////////////////////////////////////////////
                 //Update the reference
                 FX_DWORD dwOldPageObj = pSrcPageDict->GetObjNum();
                 FX_DWORD dwNewPageObj = pCurPageDict->GetObjNum();
                 
-                pMapPtrToPtr->SetAt((FX_LPVOID)(FX_UINTPTR)dwOldPageObj, (FX_LPVOID)(FX_UINTPTR)dwNewPageObj);
+                pMapPtrToPtr->SetAt((FX_LPVOID)(uintptr_t)dwOldPageObj, (FX_LPVOID)(uintptr_t)dwNewPageObj);
 
                 this->UpdateReference(pCurPageDict, pDestPDFDoc, pMapPtrToPtr);
                 curpage++;
         }
 
         delete pMapPtrToPtr;
         return TRUE;
 }
 
 CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(CPDF_Dictionary *pDict, CFX_ByteString nSrctag)
@@ skipping 270 matching lines @@
                 return FALSE;
         CPDFXFA_Document* pDstDoc = (CPDFXFA_Document*)dest_doc;
         CPDF_Document* pDstPDFDoc = pDstDoc->GetPDFDoc();
         CPDF_Dictionary* pDstDict = pDstPDFDoc->GetRoot();
         if(!pDstDict)
                 return FALSE;
         pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
         return TRUE;
 }