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

xfa/src/fxbarcode/oned/BC_OneDimReader.h

Index: xfa/src/fxbarcode/oned/BC_OneDimReader.h
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.h b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
index bb10060ba30ef26a823a9caf363c218f6035b25d..2e644de8410aa0f1930a024252c08b5c258b8e60 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
@@ -12,28 +12,28 @@ class CBC_OneDimReader;
 class CBC_OneDimReader : public CBC_OneDReader
 {
 private:
-    const static FX_INT32 MAX_AVG_VARIANCE;
-    const static FX_INT32 MAX_INDIVIDUAL_VARIANCE;
+    const static int32_t MAX_AVG_VARIANCE;
+    const static int32_t MAX_INDIVIDUAL_VARIANCE;
 
-    FX_BOOL CheckStandardUPCEANChecksum(CFX_ByteString &s, FX_INT32 &e);
+    FX_BOOL CheckStandardUPCEANChecksum(CFX_ByteString &s, int32_t &e);
 public:
-    const static FX_INT32 START_END_PATTERN[3];
-    const static FX_INT32 MIDDLE_PATTERN[5];
-    const static FX_INT32 L_PATTERNS[10][4];
-    const static FX_INT32 L_AND_G_PATTERNS[20][4];
+    const static int32_t START_END_PATTERN[3];
+    const static int32_t MIDDLE_PATTERN[5];
+    const static int32_t L_PATTERNS[10][4];
+    const static int32_t L_AND_G_PATTERNS[20][4];
     CBC_OneDimReader();
     virtual ~CBC_OneDimReader();
-    CFX_ByteString DecodeRow(FX_INT32 rowNumber, CBC_CommonBitArray *row, FX_INT32 hints, FX_INT32 &e);
-    CFX_ByteString DecodeRow(FX_INT32 rowNumber, CBC_CommonBitArray *row, CFX_Int32Array *startGuardRange, FX_INT32 hints, FX_INT32 &e);
+    CFX_ByteString DecodeRow(int32_t rowNumber, CBC_CommonBitArray *row, int32_t hints, int32_t &e);
+    CFX_ByteString DecodeRow(int32_t rowNumber, CBC_CommonBitArray *row, CFX_Int32Array *startGuardRange, int32_t hints, int32_t &e);
 protected:
-    CFX_Int32Array *FindStartGuardPattern(CBC_CommonBitArray *row, FX_INT32 &e);
-    virtual FX_BOOL CheckChecksum(CFX_ByteString &s, FX_INT32 &e);
-    CFX_Int32Array *FindGuardPattern(CBC_CommonBitArray *row, FX_INT32 rowOffset, FX_BOOL whiteFirst, CFX_Int32Array *pattern, FX_INT32 &e);
-    FX_INT32 DecodeDigit(CBC_CommonBitArray *row, CFX_Int32Array *counters, FX_INT32 rowOffset, const FX_INT32* patterns, FX_INT32 patternLength, FX_INT32 &e);
-    virtual FX_INT32 DecodeMiddle(CBC_CommonBitArray *row, CFX_Int32Array *startRange, CFX_ByteString &resultResult, FX_INT32 &e)
+    CFX_Int32Array *FindStartGuardPattern(CBC_CommonBitArray *row, int32_t &e);
+    virtual FX_BOOL CheckChecksum(CFX_ByteString &s, int32_t &e);
+    CFX_Int32Array *FindGuardPattern(CBC_CommonBitArray *row, int32_t rowOffset, FX_BOOL whiteFirst, CFX_Int32Array *pattern, int32_t &e);
+    int32_t DecodeDigit(CBC_CommonBitArray *row, CFX_Int32Array *counters, int32_t rowOffset, const int32_t* patterns, int32_t patternLength, int32_t &e);
+    virtual int32_t DecodeMiddle(CBC_CommonBitArray *row, CFX_Int32Array *startRange, CFX_ByteString &resultResult, int32_t &e)
     {
         return 0;
     }
-    virtual CFX_Int32Array *DecodeEnd(CBC_CommonBitArray *row, FX_INT32 endStart, FX_INT32 &e);
+    virtual CFX_Int32Array *DecodeEnd(CBC_CommonBitArray *row, int32_t endStart, int32_t &e);
 };
 #endif