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

xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h

Index: xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index b37d9d8e19cb44283583f4a87364bac5e6d5d480..641d041809356659058fc3928ee2f8e6669d8a8d 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -15,11 +15,11 @@ public:
     CBC_OnedCode39Writer();
     CBC_OnedCode39Writer(FX_BOOL extendedMode);
     virtual ~CBC_OnedCode39Writer();
-    FX_BYTE			*Encode(const CFX_ByteString &contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 &e);
-    FX_BYTE			*Encode(const CFX_ByteString &contents, BCFORMAT format, FX_INT32 &outWidth, FX_INT32 &outHeight, FX_INT32 hints, FX_INT32 &e);
-    FX_BYTE			*Encode(const CFX_ByteString &contents, FX_INT32 &outLength, FX_INT32 &e);
-    void			RenderResult(FX_WSTR contents, FX_BYTE* code, FX_INT32 codeLength, FX_BOOL isDevice, FX_INT32 &e);
-    CFX_WideString  encodedContents(FX_WSTR contents, FX_INT32 &e);
+    uint8_t			*Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e);
+    uint8_t			*Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e);
+    uint8_t			*Encode(const CFX_ByteString &contents, int32_t &outLength, int32_t &e);
+    void			RenderResult(FX_WSTR contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e);
+    CFX_WideString  encodedContents(FX_WSTR contents, int32_t &e);
     FX_BOOL			CheckContentValidity(FX_WSTR contents);
     FX_BOOL         CheckExtendedContentValidity(FX_WSTR contents);
     CFX_WideString	FilterContents(FX_WSTR contents);
@@ -27,11 +27,11 @@ public:
     CFX_WideString  RenderTextContents(FX_WSTR contents);
     CFX_WideString  RenderExtendedTextContents(FX_WSTR contents);
     FX_BOOL			SetTextLocation(BC_TEXT_LOC loction);
-    FX_BOOL			SetWideNarrowRatio(FX_INT32 ratio);
+    FX_BOOL			SetWideNarrowRatio(int32_t ratio);
 private:
-    void			ToIntArray(FX_INT32 a, FX_INT32 *toReturn);
-    FX_CHAR			CalcCheckSum(const CFX_ByteString &contents, FX_INT32 &e);
-    FX_INT32		m_iWideNarrRatio;
+    void			ToIntArray(int32_t a, int32_t *toReturn);
+    FX_CHAR			CalcCheckSum(const CFX_ByteString &contents, int32_t &e);
+    int32_t		m_iWideNarrRatio;
     FX_BOOL         m_extendedMode;
 };
 #endif