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

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h

Index: core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
index 3f43c979a5196875b44d7f82bfeea534ea05c05e..45e2940d3aa0def2cf255391c12c8e5054627f15 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
@@ -68,7 +68,7 @@ private:
     FXCODEC_STATUS decode_Arith_Template3_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
     FXCODEC_STATUS decode_Arith_Template3_unopt(CJBig2_Image * pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
     FX_DWORD	m_loopIndex;
-    FX_BYTE *	m_pLine;
+    uint8_t *	m_pLine;
     IFX_Pause*	m_pPause;
     FXCODEC_STATUS	m_ProssiveStatus;
     CJBig2_Image** m_pImage;
@@ -114,7 +114,7 @@ public:
     FX_BOOL MMR;
     FX_DWORD GBW;
     FX_DWORD GBH;
-    FX_BYTE GBTEMPLATE;
+    uint8_t GBTEMPLATE;
     FX_BOOL TPGDON;
     FX_BOOL USESKIP;
     CJBig2_Image * SKIP;
@@ -140,8 +140,8 @@ public:
     FX_DWORD GRH;
     FX_BOOL GRTEMPLATE;
     CJBig2_Image *GRREFERENCE;
-    FX_INT32 GRREFERENCEDX;
-    FX_INT32 GRREFERENCEDY;
+    int32_t GRREFERENCEDX;
+    int32_t GRREFERENCEDY;
     FX_BOOL TPGRON;
     signed char	GRAT[4];
 };
@@ -175,7 +175,7 @@ public:
     FX_DWORD SBNUMSYMS;
 
     JBig2HuffmanCode *SBSYMCODES;
-    FX_BYTE SBSYMCODELEN;
+    uint8_t SBSYMCODELEN;
 
     CJBig2_Image **SBSYMS;
     FX_BOOL SBDEFPIXEL;
@@ -214,7 +214,7 @@ public:
                         *SDHUFFDW,
                         *SDHUFFBMSIZE,
                         *SDHUFFAGGINST;
-    FX_BYTE SDTEMPLATE;
+    uint8_t SDTEMPLATE;
     signed char SDAT[8];
     FX_BOOL SDRTEMPLATE;
     signed char SDRAT[4];
@@ -230,7 +230,7 @@ public:
     FX_DWORD HBW,
              HBH;
     FX_BOOL HMMR;
-    FX_BYTE HTEMPLATE;
+    uint8_t HTEMPLATE;
     FX_DWORD HNUMPATS;
     CJBig2_Image **HPATS;
     FX_BOOL HDEFPIXEL;
@@ -238,11 +238,11 @@ public:
     FX_BOOL HENABLESKIP;
     FX_DWORD HGW,
              HGH;
-    FX_INT32 HGX,
+    int32_t HGX,
              HGY;
     FX_WORD HRX,
             HRY;
-    FX_BYTE HPW,
+    uint8_t HPW,
             HPH;
 };
 class CJBig2_PDDProc : public CJBig2_Object
@@ -254,10 +254,10 @@ public:
     CJBig2_PatternDict *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
 public:
     FX_BOOL HDMMR;
-    FX_BYTE HDPW,
+    uint8_t HDPW,
             HDPH;
     FX_DWORD GRAYMAX;
-    FX_BYTE HDTEMPLATE;
+    uint8_t HDTEMPLATE;
 };
 class CJBig2_GSIDProc : public CJBig2_Object
 {
@@ -269,10 +269,10 @@ public:
 public:
     FX_BOOL GSMMR;
     FX_BOOL GSUSESKIP;
-    FX_BYTE GSBPP;
+    uint8_t GSBPP;
     FX_DWORD GSW,
              GSH;
-    FX_BYTE GSTEMPLATE;
+    uint8_t GSTEMPLATE;
     CJBig2_Image *GSKIP;
 };
 #endif