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

xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h

Index: xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
index 0450a28725f1c87cc9a6358ad7e0532633224ed7..5ace54744226339058f239e088ccbcff96780dd6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -12,42 +12,42 @@ class CBC_SymbolInfo;
 class CBC_SymbolInfo : public CBC_SymbolShapeHint
 {
 public:
-    CBC_SymbolInfo(FX_BOOL rectangular, FX_INT32 dataCapacity, FX_INT32 errorCodewords,
-                   FX_INT32 matrixWidth, FX_INT32 matrixHeight, FX_INT32 dataRegions);
+    CBC_SymbolInfo(FX_BOOL rectangular, int32_t dataCapacity, int32_t errorCodewords,
+                   int32_t matrixWidth, int32_t matrixHeight, int32_t dataRegions);
     virtual ~CBC_SymbolInfo();
     static void Initialize();
     static void Finalize();
     static void overrideSymbolSet(CBC_SymbolInfo* override);
-    static CBC_SymbolInfo* lookup(FX_INT32 dataCodewords, FX_INT32 &e);
-    static CBC_SymbolInfo* lookup(FX_INT32 dataCodewords, SymbolShapeHint shape, FX_INT32 &e);
-    static CBC_SymbolInfo* lookup(FX_INT32 dataCodewords, FX_BOOL allowRectangular, FX_BOOL fail, FX_INT32 &e);
-    static CBC_SymbolInfo* lookup(FX_INT32 dataCodewords, SymbolShapeHint shape, FX_BOOL fail, FX_INT32 &e);
-    static CBC_SymbolInfo* lookup(FX_INT32 dataCodewords, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, FX_BOOL fail, FX_INT32 &e);
-    FX_INT32 getHorizontalDataRegions(FX_INT32 &e);
-    FX_INT32 getVerticalDataRegions(FX_INT32 &e);
-    FX_INT32 getSymbolDataWidth(FX_INT32 &e);
-    FX_INT32 getSymbolDataHeight(FX_INT32 &e);
-    FX_INT32 getSymbolWidth(FX_INT32 &e);
-    FX_INT32 getSymbolHeight(FX_INT32 &e);
-    FX_INT32 getCodewordCount();
-    FX_INT32 getInterleavedBlockCount();
-    FX_INT32 getDataLengthForInterleavedBlock(FX_INT32 index);
-    FX_INT32 getErrorLengthForInterleavedBlock(FX_INT32 index);
-    CFX_WideString toString(FX_INT32 &e);
+    static CBC_SymbolInfo* lookup(int32_t dataCodewords, int32_t &e);
+    static CBC_SymbolInfo* lookup(int32_t dataCodewords, SymbolShapeHint shape, int32_t &e);
+    static CBC_SymbolInfo* lookup(int32_t dataCodewords, FX_BOOL allowRectangular, FX_BOOL fail, int32_t &e);
+    static CBC_SymbolInfo* lookup(int32_t dataCodewords, SymbolShapeHint shape, FX_BOOL fail, int32_t &e);
+    static CBC_SymbolInfo* lookup(int32_t dataCodewords, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, FX_BOOL fail, int32_t &e);
+    int32_t getHorizontalDataRegions(int32_t &e);
+    int32_t getVerticalDataRegions(int32_t &e);
+    int32_t getSymbolDataWidth(int32_t &e);
+    int32_t getSymbolDataHeight(int32_t &e);
+    int32_t getSymbolWidth(int32_t &e);
+    int32_t getSymbolHeight(int32_t &e);
+    int32_t getCodewordCount();
+    int32_t getInterleavedBlockCount();
+    int32_t getDataLengthForInterleavedBlock(int32_t index);
+    int32_t getErrorLengthForInterleavedBlock(int32_t index);
+    CFX_WideString toString(int32_t &e);
 public:
-    FX_INT32 m_dataCapacity;
-    FX_INT32 m_errorCodewords;
-    FX_INT32 m_matrixWidth;
-    FX_INT32 m_matrixHeight;
-    FX_INT32 m_rsBlockData;
-    FX_INT32 m_rsBlockError;
+    int32_t m_dataCapacity;
+    int32_t m_errorCodewords;
+    int32_t m_matrixWidth;
+    int32_t m_matrixHeight;
+    int32_t m_rsBlockData;
+    int32_t m_rsBlockError;
     static CBC_SymbolInfo* m_PROD_SYMBOLS[30];
 private:
     static CBC_SymbolInfo* m_symbols[30];
     FX_BOOL m_rectangular;
-    FX_INT32 m_dataRegions;
+    int32_t m_dataRegions;
 private:
-    CBC_SymbolInfo(FX_BOOL rectangular, FX_INT32 dataCapacity, FX_INT32 errorCodewords, FX_INT32 matrixWidth, FX_INT32 matrixHeight, FX_INT32 dataRegions,
-                   FX_INT32 rsBlockData, FX_INT32 rsBlockError);
+    CBC_SymbolInfo(FX_BOOL rectangular, int32_t dataCapacity, int32_t errorCodewords, int32_t matrixWidth, int32_t matrixHeight, int32_t dataRegions,
+                   int32_t rsBlockData, int32_t rsBlockError);
 };
 #endif