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

core/src/fpdfdoc/doc_basic.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/fpdfdoc/fpdf_doc.h"
 const int nMaxRecursion = 32;
 int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc)
 {
@@ skipping 85 matching lines @@
         }
         if (csName.Compare(csLeft) < 0 || csName.Compare(csRight) > 0) {
             return NULL;
         }
     }
     CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
     if (pNames) {
         FX_DWORD dwCount = pNames->GetCount() / 2;
         for (FX_DWORD i = 0; i < dwCount; i ++) {
             CFX_ByteString csValue = pNames->GetString(i * 2);
-            FX_INT32 iCompare = csValue.Compare(csName);
+            int32_t iCompare = csValue.Compare(csName);
             if (iCompare <= 0) {
                 if (ppFind != NULL) {
                     *ppFind = pNames;
                 }
                 if (iCompare < 0) {
                     continue;
                 }
             } else {
                 break;
             }
@@ skipping 281 matching lines @@
     return ChangeSlashToPDF(filepath.GetPtr());
 #else
     return filepath;
 #endif
 }
 CPDF_Stream* CPDF_FileSpec::GetFileStream() const
 {
     if (m_pObj == NULL) {
         return NULL;
     }
-    FX_INT32 iType = m_pObj->GetType();
+    int32_t iType = m_pObj->GetType();
     if (iType == PDFOBJ_STREAM) {
         return (CPDF_Stream*)m_pObj;
     } else if (iType == PDFOBJ_DICTIONARY) {
         CPDF_Dictionary *pEF = ((CPDF_Dictionary*)m_pObj)->GetDict(FX_BSTRC("EF"));
         if (pEF == NULL) {
             return NULL;
         }
         return pEF->GetStream(FX_BSTRC("F"));
     }
     return NULL;
 }
 static void FPDFDOC_FILESPEC_SetFileName(CPDF_Object *pObj, FX_WSTR wsFileName, FX_BOOL bURL)
 {
     ASSERT(pObj != NULL);
     CFX_WideString wsStr;
     if (bURL) {
         wsStr = wsFileName;
     } else {
         wsStr = FILESPEC_EncodeFileName(wsFileName);
     }
-    FX_INT32 iType = pObj->GetType();
+    int32_t iType = pObj->GetType();
     if (iType == PDFOBJ_STRING) {
         pObj->SetString(CFX_ByteString::FromUnicode(wsStr));
     } else if (iType == PDFOBJ_DICTIONARY) {
         CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
         pDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(wsStr));
         pDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(wsStr));
     }
 }
 void CPDF_FileSpec::SetFileName(FX_WSTR wsFileName, FX_BOOL bURL)
 {
@@ skipping 93 matching lines @@
             CFX_ByteString bsNumberingStyle = pLabel->GetString(FX_BSTRC("S"), NULL);
             int nLabelNum = nPage - n + pLabel->GetInteger(FX_BSTRC("St"), 1);
             CFX_WideString wsNumPortion = _GetLabelNumPortion(nLabelNum, bsNumberingStyle);
             wsLabel += wsNumPortion;
             return wsLabel;
         }
     }
     wsLabel.Format(L"%d", nPage + 1);
     return wsLabel;
 }
-FX_INT32 CPDF_PageLabel::GetPageByLabel(FX_BSTR bsLabel) const
+int32_t CPDF_PageLabel::GetPageByLabel(FX_BSTR bsLabel) const
 {
     if (m_pDocument == NULL) {
         return -1;
     }
     CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
     if (pPDFRoot == NULL) {
         return -1;
     }
     int nPages = m_pDocument->GetPageCount();
     CFX_ByteString bsLbl;
     CFX_ByteString bsOrig = bsLabel;
     for (int i = 0; i < nPages; i++) {
         bsLbl = PDF_EncodeText(GetLabel(i));
         if (!bsLbl.Compare(bsOrig)) {
             return i;
         }
     }
     bsLbl = bsOrig;
     int nPage = FXSYS_atoi(bsLbl);
     if (nPage > 0 && nPage <= nPages) {
         return nPage;
     }
     return -1;
 }
-FX_INT32 CPDF_PageLabel::GetPageByLabel(FX_WSTR wsLabel) const
+int32_t CPDF_PageLabel::GetPageByLabel(FX_WSTR wsLabel) const
 {
     CFX_ByteString bsLabel = PDF_EncodeText(wsLabel.GetPtr());
     return GetPageByLabel(bsLabel);
 }