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

core/include/fpdfapi/fpdf_resource.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_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
 #include "../fxge/fx_font.h"
@@ skipping 142 matching lines @@
     FXFT_Face                           GetFace() const
     {
         return m_Font.GetFace();
     }
 
     virtual FX_DWORD            GetNextChar(FX_LPCSTR pString, int nStrLen, int& offset) const
     {
         if (offset < 0 || nStrLen < 1) {
             return 0;
         }
-        FX_BYTE ch = offset < nStrLen ? pString[offset++] : pString[nStrLen-1];
+        uint8_t ch = offset < nStrLen ? pString[offset++] : pString[nStrLen-1];
         return static_cast<FX_DWORD>(ch);
     }
 
     virtual int                         CountChar(FX_LPCSTR pString, int size) const
     {
         return size;
     }
 
     void                                        AppendChar(CFX_ByteString& str, FX_DWORD charcode) const;
 
@@ skipping 145 matching lines @@
 public:
 
     CPDF_FontEncoding();
 
     CPDF_FontEncoding(int PredefinedEncoding);
 
     void                                        LoadEncoding(CPDF_Object* pEncoding);
 
     FX_BOOL                                     IsIdentical(CPDF_FontEncoding* pAnother) const;
 
-    FX_WCHAR                            UnicodeFromCharCode(FX_BYTE charcode) const
+    FX_WCHAR                            UnicodeFromCharCode(uint8_t charcode) const
     {
         return m_Unicodes[charcode];
     }
 
     int                                         CharCodeFromUnicode(FX_WCHAR unicode) const;
 
-    void                                        SetUnicode(FX_BYTE charcode, FX_WCHAR unicode)
+    void                                        SetUnicode(uint8_t charcode, FX_WCHAR unicode)
     {
         m_Unicodes[charcode] = unicode;
     }
 
     CPDF_Object*                        Realize();
 public:
 
     FX_WCHAR                            m_Unicodes[256];
 };
 class CPDF_SimpleFont : public CPDF_Font
@@ skipping 14 matching lines @@
 
     FX_BOOL                                     LoadCommon();
 
     void                                        LoadSubstFont();
 
     void                                        LoadFaceMetrics();
 
     virtual void                        LoadGlyphMap() = 0;
     virtual FX_WCHAR            _UnicodeFromCharCode(FX_DWORD charcode) const
     {
-        return m_Encoding.UnicodeFromCharCode((FX_BYTE)charcode);
+        return m_Encoding.UnicodeFromCharCode((uint8_t)charcode);
     }
     virtual FX_DWORD            _CharCodeFromUnicode(FX_WCHAR Unicode) const
     {
         return m_Encoding.CharCodeFromUnicode(Unicode);
     }
 
 
 
     CPDF_FontEncoding           m_Encoding;
 
@@ skipping 442 matching lines @@
 #define PDF_IMAGE_MASK_LOSSLESS_COMPRESS        0x0008
 class CPDF_ImageSetParam
 {
 public:
     CPDF_ImageSetParam()
         : pMatteColor(NULL)
         , nQuality(80)
     {
     }
     FX_ARGB* pMatteColor;
-    FX_INT32 nQuality;
+    int32_t nQuality;
 };
 class CPDF_Image 
 {
 public:
 
     CPDF_Image(CPDF_Document* pDoc);
 
     ~CPDF_Image();
 
     FX_BOOL                                     LoadImageF(CPDF_Stream* pImageStream, FX_BOOL bInline);
@@ skipping 32 matching lines @@
         return m_pOC;
     }
 
     CPDF_Document*                      GetDocument() const
     {
         return m_pDocument;
     }
 
 
 
-    FX_INT32                            GetPixelHeight() const
+    int32_t                             GetPixelHeight() const
     {
         return m_Height;
     }
 
-    FX_INT32                            GetPixelWidth() const
+    int32_t                             GetPixelWidth() const
     {
         return m_Width;
     }
 
 
     FX_BOOL                                     IsMask() const
     {
         return m_bIsMask;
     }
 
     FX_BOOL                                     IsInterpol() const
     {
         return m_bInterpolate;
     }
 
     CFX_DIBSource*                      LoadDIBSource(CFX_DIBSource** ppMask = NULL, FX_DWORD* pMatteColor = NULL, FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE) const;
 
 
 
-    void                                        SetImage(const CFX_DIBitmap* pDIBitmap, FX_INT32 iCompress, IFX_FileWrite *pFileWrite = NULL, IFX_FileRead *pFileRead = NULL, const CFX_DIBitmap* pMask = NULL, const CPDF_ImageSetParam* pParam = NULL);
+    void                                        SetImage(const CFX_DIBitmap* pDIBitmap, int32_t iCompress, IFX_FileWrite *pFileWrite = NULL, IFX_FileRead *pFileRead = NULL, const CFX_DIBitmap* pMask = NULL, const CPDF_ImageSetParam* pParam = NULL);
 
-    void                                        SetJpegImage(FX_BYTE* pImageData, FX_DWORD size);
+    void                                        SetJpegImage(uint8_t* pImageData, FX_DWORD size);
 
     void                                        SetJpegImage(IFX_FileRead *pFile);
 
     void                                        ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pDIBitmap);
 
 public:
     FX_BOOL                                     StartLoadDIBSource(CPDF_Dictionary* pFormResource, CPDF_Dictionary* pPageResource, FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE);
     FX_BOOL                                     Continue(IFX_Pause* pPause);
     CFX_DIBSource*                      DetachBitmap();
     CFX_DIBSource*                      DetachMask();
     CFX_DIBSource*                      m_pDIBSource;
     CFX_DIBSource*                      m_pMask;
     FX_DWORD                            m_MatteColor;
 private:
 
     CPDF_Stream*                        m_pStream;
     FX_BOOL                                     m_bInline;
     CPDF_Dictionary*            m_pInlineDict;
 
-    FX_INT32                            m_Height;
+    int32_t                             m_Height;
 
-    FX_INT32                            m_Width;
+    int32_t                             m_Width;
 
     FX_BOOL                                     m_bIsMask;
 
     FX_BOOL                                     m_bInterpolate;
 
     CPDF_Document*                      m_pDocument;
 
     CPDF_Dictionary*            m_pOC;
     CPDF_Dictionary*    InitJPEG(FX_LPBYTE pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_