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

core/src/fpdfapi/fpdf_page/pageint.h

 // 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
 
 #ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 
 #define PARSE_STEP_LIMIT                100
 #define STREAM_PARSE_BUFSIZE    20480
 class CPDF_QuickFontCache;
 class CPDF_StreamParser 
 {
 public:
 
-    CPDF_StreamParser(const FX_BYTE* pData, FX_DWORD dwSize);
+    CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize);
     ~CPDF_StreamParser();
 
     CPDF_Stream*                ReadInlineStream(CPDF_Document* pDoc, CPDF_Dictionary* pDict, CPDF_Object* pCSObj, FX_BOOL bDecode);
     typedef enum { EndOfData, Number, Keyword, Name, Others } SyntaxType;
 
     SyntaxType                  ParseNextElement();
     FX_LPBYTE                   GetWordBuf()
     {
         return m_WordBuffer;
     }
@@ skipping 15 matching lines @@
     {
         m_Pos = pos;
     }
 
     CPDF_Object*                ReadNextObject(FX_BOOL bAllowNestedArray = FALSE, FX_BOOL bInArray = FALSE);
     void                                SkipPathObject();
 protected:
     void                                GetNextWord(FX_BOOL& bIsNumber);
     CFX_ByteString              ReadString();
     CFX_ByteString              ReadHexString();
-    const FX_BYTE*              m_pBuf;
+    const uint8_t*              m_pBuf;
     FX_DWORD                    m_Size;
     FX_DWORD                    m_Pos;
-    FX_BYTE                             m_WordBuffer[256];
+    uint8_t                             m_WordBuffer[256];
     FX_DWORD                    m_WordSize;
     CPDF_Object*                m_pLastObj;
 };
 typedef enum {
     PDFOP_CloseFillStrokePath = 0, PDFOP_FillStrokePath,
     PDFOP_CloseEOFillStrokePath, PDFOP_EOFillStrokePath,
     PDFOP_BeginMarkedContent_Dictionary, PDFOP_BeginImage,
     PDFOP_BeginMarkedContent, PDFOP_BeginText,
     PDFOP_BeginSectionUndefined, PDFOP_CurveTo_123,
     PDFOP_ConcatMatrix, PDFOP_SetColorSpace_Fill,
@@ skipping 77 matching lines @@
     void                                AddObjectParam(CPDF_Object* pObj);
     void                                AddNameParam(FX_LPCSTR name, int size);
     int                                 GetNextParamPos();
     void                                ClearAllParams();
     CPDF_Object*                GetObject(FX_DWORD index);
     CFX_ByteString              GetString(FX_DWORD index);
     FX_FLOAT                    GetNumber(FX_DWORD index);
     FX_FLOAT            GetNumber16(FX_DWORD index);
     int                                 GetInteger(FX_DWORD index)
     {
-        return (FX_INT32)(GetNumber(index));
+        return (int32_t)(GetNumber(index));
     }
     FX_BOOL                             OnOperator(FX_LPCSTR op);
     void                                BigCaseCaller(int index);
     FX_BOOL                             m_bAbort;
     CPDF_StreamParser*  m_pSyntax;
     FX_DWORD                    GetParsePos()
     {
         return m_pSyntax->GetPos();
     }
     CPDF_AllStates*             m_pCurStates;
@@ skipping 164 matching lines @@
 {
     FX_POSITION pos = map.GetStartPosition();
     while (pos) {
         KeyType findKey;
         map.GetNextAssoc(pos, findKey, findData);
         if (findData->m_Obj == findValue) {
             return findKey;
         }
     }
     findData = NULL;
-    return (KeyType)(FX_UINTPTR)NULL;
+    return (KeyType)(uintptr_t)NULL;
 }
 template <class KeyType, class ValueType>
 FX_BOOL PDF_DocPageData_Release(CFX_MapPtrTemplate<KeyType, CPDF_CountedObject<ValueType>*> &map, KeyType findKey, ValueType findValue, FX_BOOL bForce = FALSE)
 {
     if (!findKey && !findValue) {
         return FALSE;
     }
     CPDF_CountedObject<ValueType>* findData = NULL;
     if (!findKey) {
         findKey = PDF_DocPageData_FindValue<KeyType, ValueType>(map, findValue, findData);
@@ skipping 63 matching lines @@
     FX_FLOAT*   m_pRanges;
     FX_BOOL             Init(CPDF_Object* pObj);
     virtual FX_BOOL     v_Init(CPDF_Object* pObj) = 0;
     virtual FX_BOOL     v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0;
 };
 class CPDF_IccProfile 
 {
 public:
     CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize);
     ~CPDF_IccProfile();
-    FX_INT32 GetComponents() const { return m_nSrcComponents; }
+    int32_t GetComponents() const { return m_nSrcComponents; }
     FX_BOOL                                     m_bsRGB;
     FX_LPVOID                           m_pTransform;
 private:
-    FX_INT32                m_nSrcComponents;
+    int32_t                m_nSrcComponents;
 };
 class CPDF_DeviceCS : public CPDF_ColorSpace
 {
 public:
     CPDF_DeviceCS(int family);
     virtual FX_BOOL     GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const;
     FX_BOOL     SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const;
     FX_BOOL     v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const;
     FX_BOOL     v_SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const;
     virtual void        TranslateImageLine(FX_LPBYTE pDestBuf, FX_LPCBYTE pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask = FALSE) const;
@@ skipping 20 matching lines @@
         CFX_ByteString  m_Prefix;
         int                             m_nIndex;
     };
     ~CPDF_ResourceNaming();
     CFX_ByteString              GetName(const CPDF_Dictionary* pResList, FX_LPCSTR szType);
 protected:
     CFX_MapByteStringToPtr      m_NamingCache;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_