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

xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h

Index: xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 45db8001768b6baad8ba34a5667c1aabe7340456..4fa5407fb5d169262de95b47a9f4e8908f6a053d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -13,17 +13,17 @@ class CBC_DataMatrixDecodedBitStreamParser
 public:
     CBC_DataMatrixDecodedBitStreamParser();
     virtual ~CBC_DataMatrixDecodedBitStreamParser();
-    static CBC_CommonDecoderResult *Decode(CFX_ByteArray &bytes, FX_INT32 &e);
+    static CBC_CommonDecoderResult *Decode(CFX_ByteArray &bytes, int32_t &e);
 
 private:
-    static FX_INT32 DecodeAsciiSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, CFX_ByteString &resultTrailer, FX_INT32 &e);
-    static void DecodeC40Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, FX_INT32 &e);
-    static void DecodeTextSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, FX_INT32 &e);
-    static void DecodeAnsiX12Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, FX_INT32 &e);
-    static void ParseTwoBytes(FX_INT32 firstByte, FX_INT32 secondByte, CFX_Int32Array &result);
-    static void DecodeEdifactSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, FX_INT32 &e);
-    static void DecodeBase256Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, CFX_Int32Array &byteSegments, FX_INT32 &e);
-    static FX_BYTE Unrandomize255State(FX_INT32 randomizedBase256Codeword, FX_INT32 base256CodewordPosition);
+    static int32_t DecodeAsciiSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, CFX_ByteString &resultTrailer, int32_t &e);
+    static void DecodeC40Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, int32_t &e);
+    static void DecodeTextSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, int32_t &e);
+    static void DecodeAnsiX12Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, int32_t &e);
+    static void ParseTwoBytes(int32_t firstByte, int32_t secondByte, CFX_Int32Array &result);
+    static void DecodeEdifactSegment(CBC_CommonBitSource *bits, CFX_ByteString &result, int32_t &e);
+    static void DecodeBase256Segment(CBC_CommonBitSource *bits, CFX_ByteString &result, CFX_Int32Array &byteSegments, int32_t &e);
+    static uint8_t Unrandomize255State(int32_t randomizedBase256Codeword, int32_t base256CodewordPosition);
 
     const static FX_CHAR C40_BASIC_SET_CHARS[];
     const static FX_CHAR C40_SHIFT2_SET_CHARS[];
@@ -31,12 +31,12 @@ private:
 
     const static FX_CHAR TEXT_BASIC_SET_CHARS[];
     const static FX_CHAR TEXT_SHIFT3_SET_CHARS[];
-    const static FX_INT32 PAD_ENCODE;
-    const static FX_INT32 ASCII_ENCODE;
-    const static FX_INT32 C40_ENCODE;
-    const static FX_INT32 TEXT_ENCODE;
-    const static FX_INT32 ANSIX12_ENCODE;
-    const static FX_INT32 EDIFACT_ENCODE;
-    const static FX_INT32 BASE256_ENCODE;
+    const static int32_t PAD_ENCODE;
+    const static int32_t ASCII_ENCODE;
+    const static int32_t C40_ENCODE;
+    const static int32_t TEXT_ENCODE;
+    const static int32_t ANSIX12_ENCODE;
+    const static int32_t EDIFACT_ENCODE;
+    const static int32_t BASE256_ENCODE;
 };
 #endif