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

core/src/fpdfapi/fpdf_page/fpdf_page_doc.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 "../../../include/fdrm/fx_crypt.h"
 #include "../fpdf_font/font_int.h"
@@ skipping 554 matching lines @@
     if (!pIccProfileStream) {
         return NULL;
     }
     CPDF_CountedObject<CPDF_IccProfile*>* ipData = NULL;
     if (m_IccProfileMap.Lookup(pIccProfileStream, ipData)) {
         ipData->m_nCount++;
         return ipData->m_Obj;
     }
     CPDF_StreamAcc stream;
     stream.LoadAllData(pIccProfileStream, FALSE);
-    FX_BYTE digest[20];
+    uint8_t digest[20];
     CPDF_Stream* pCopiedStream = NULL;
     CRYPT_SHA1Generate(stream.GetData(), stream.GetSize(), digest);
     if (m_HashProfileMap.Lookup(CFX_ByteStringC(digest, 20), (void*&)pCopiedStream)) {
         m_IccProfileMap.Lookup(pCopiedStream, ipData);
         ipData->m_nCount++;
         return ipData->m_Obj;
     }
     CPDF_IccProfile* pProfile = new CPDF_IccProfile(stream.GetData(), stream.GetSize());
     ipData = new CPDF_CountedObject<CPDF_IccProfile*>;
     ipData->m_nCount = 2;
@@ skipping 28 matching lines @@
         return NULL;
     }
     CPDF_CountedObject<CPDF_StreamAcc*>* ftData;
     if (m_FontFileMap.Lookup(pFontStream, ftData)) {
         ftData->m_nCount ++;
         return ftData->m_Obj;
     }
     ftData = new CPDF_CountedObject<CPDF_StreamAcc*>;
     CPDF_StreamAcc* pFontFile = new CPDF_StreamAcc;
     CPDF_Dictionary* pFontDict = pFontStream->GetDict();
-    FX_INT32 org_size = pFontDict->GetInteger(FX_BSTRC("Length1")) + pFontDict->GetInteger(FX_BSTRC("Length2")) + pFontDict->GetInteger(FX_BSTRC("Length3"));
+    int32_t org_size = pFontDict->GetInteger(FX_BSTRC("Length1")) + pFontDict->GetInteger(FX_BSTRC("Length2")) + pFontDict->GetInteger(FX_BSTRC("Length3"));
     if (org_size < 0) {
         org_size = 0;
     }
     pFontFile->LoadAllData(pFontStream, FALSE, org_size);
     ftData->m_nCount = 2;
     ftData->m_Obj = pFontFile;
     m_FontFileMap.SetAt(pFontStream, ftData);
     return pFontFile;
 }
 void CPDF_DocPageData::ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce)
@@ skipping 16 matching lines @@
 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(CPDF_Object* pPatternObj) const
 {
     if (!pPatternObj) return NULL;
     CPDF_CountedObject<CPDF_Pattern*>* ptData;
     if (m_PatternMap.Lookup(pPatternObj, ptData))
     {
         return ptData;
     }
     return NULL;
 }