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

core/src/fxcodec/jbig2/JBig2_Image.h

Index: core/src/fxcodec/jbig2/JBig2_Image.h
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/src/fxcodec/jbig2/JBig2_Image.h
index 5d06695c7ca54419a288e07e3ccafd798da55ca2..423bebcede9996a173c646f157009ff8bf404f26 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.h
+++ b/core/src/fxcodec/jbig2/JBig2_Image.h
@@ -20,48 +20,48 @@ class CJBig2_Image : public CJBig2_Object
 {
 public:
 
-    CJBig2_Image(FX_INT32 w, FX_INT32 h);
+    CJBig2_Image(int32_t w, int32_t h);
 
-    CJBig2_Image(FX_INT32 w, FX_INT32 h, FX_INT32 stride, FX_BYTE*pBuf);
+    CJBig2_Image(int32_t w, int32_t h, int32_t stride, uint8_t*pBuf);
 
     CJBig2_Image(CJBig2_Image &im);
 
     ~CJBig2_Image();
 
-    FX_BOOL getPixel(FX_INT32 x, FX_INT32 y);
+    FX_BOOL getPixel(int32_t x, int32_t y);
 
-    FX_INT32 setPixel(FX_INT32 x, FX_INT32 y, FX_BOOL v);
+    int32_t setPixel(int32_t x, int32_t y, FX_BOOL v);
 
-    void copyLine(FX_INT32 hTo, FX_INT32 hFrom);
+    void copyLine(int32_t hTo, int32_t hFrom);
 
     void fill(FX_BOOL v);
 
-    FX_BOOL composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
-    FX_BOOL composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+    FX_BOOL composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
+    FX_BOOL composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
 
-    FX_BOOL composeTo_unopt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
+    FX_BOOL composeTo_unopt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
 
-    FX_BOOL composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
+    FX_BOOL composeTo_opt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
 
-    FX_BOOL composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
-    FX_BOOL composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+    FX_BOOL composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
+    FX_BOOL composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
 
-    FX_BOOL composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op);
-    FX_BOOL composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect);
-    CJBig2_Image *subImage_unopt(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h);
+    FX_BOOL composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op);
+    FX_BOOL composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+    CJBig2_Image *subImage_unopt(int32_t x, int32_t y, int32_t w, int32_t h);
 
-    CJBig2_Image *subImage(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h);
+    CJBig2_Image *subImage(int32_t x, int32_t y, int32_t w, int32_t h);
 
-    void expand(FX_INT32 h, FX_BOOL v);
+    void expand(int32_t h, FX_BOOL v);
 public:
 
-    FX_INT32 m_nWidth;
+    int32_t m_nWidth;
 
-    FX_INT32 m_nHeight;
+    int32_t m_nHeight;
 
-    FX_INT32 m_nStride;
+    int32_t m_nStride;
 
-    FX_BYTE *m_pData;
+    uint8_t *m_pData;
 
     FX_BOOL m_bNeedFree;
 };