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

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1172793002

1 files changed, 29 insertions, 29 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index ce1e65d4c2..5da32441fc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -12,38 +12,38 @@ class CBC_QRCoderBitVector;
 class CBC_QRCoderMatrixUtil

 {

 private:

-    const static FX_INT32 POSITION_DETECTION_PATTERN[7][7];

-    const static FX_INT32 VERTICAL_SEPARATION_PATTERN[7][1];

-    const static FX_INT32 HORIZONTAL_SEPARATION_PATTERN[1][8];

-    const static FX_INT32 POSITION_ADJUSTMENT_PATTERN[5][5];

-    const static FX_INT32 POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[40][7];

-    const static FX_INT32 TYPE_INFO_COORDINATES[15][2];

-    const static FX_INT32 VERSION_INFO_POLY;

-    const static FX_INT32 TYPE_INFO_POLY;

-    const static FX_INT32 TYPE_INFO_MASK_PATTERN;

+    const static int32_t POSITION_DETECTION_PATTERN[7][7];

+    const static int32_t VERTICAL_SEPARATION_PATTERN[7][1];

+    const static int32_t HORIZONTAL_SEPARATION_PATTERN[1][8];

+    const static int32_t POSITION_ADJUSTMENT_PATTERN[5][5];

+    const static int32_t POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[40][7];

+    const static int32_t TYPE_INFO_COORDINATES[15][2];

+    const static int32_t VERSION_INFO_POLY;

+    const static int32_t TYPE_INFO_POLY;

+    const static int32_t TYPE_INFO_MASK_PATTERN;

 public:

     CBC_QRCoderMatrixUtil();

     virtual ~CBC_QRCoderMatrixUtil();

-    static void ClearMatrix(CBC_CommonByteMatrix* matrix, FX_INT32 &e);

+    static void ClearMatrix(CBC_CommonByteMatrix* matrix, int32_t &e);

     static void BuildMatrix(CBC_QRCoderBitVector* dataBits, CBC_QRCoderErrorCorrectionLevel* ecLevel,

-                            FX_INT32 version, FX_INT32 maskPattern, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedBasicPatterns(FX_INT32 version, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedTypeInfo(CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 maskPattern, CBC_CommonByteMatrix *matrix, FX_INT32 &e);

-    static void EmbedDataBits(CBC_QRCoderBitVector* dataBits, FX_INT32 maskPattern, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void MaybeEmbedVersionInfo(FX_INT32 version, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static FX_INT32 FindMSBSet(FX_INT32 value);

-    static FX_INT32 CalculateBCHCode(FX_INT32 code, FX_INT32 poly);

-    static void MakeTypeInfoBits(CBC_QRCoderErrorCorrectionLevel* ecLevel, FX_INT32 maskPattern, CBC_QRCoderBitVector* bits, FX_INT32 &e);

-    static void MakeVersionInfoBits(FX_INT32 version, CBC_QRCoderBitVector* bits, FX_INT32 &e);

-    static FX_BOOL IsEmpty(FX_INT32 value);

-    static FX_BOOL IsValidValue(FX_INT32 value);

-    static void EmbedTimingPatterns(CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedDarkDotAtLeftBottomCorner(CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedHorizontalSeparationPattern(FX_INT32 xStart, FX_INT32 yStart, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedVerticalSeparationPattern(FX_INT32 xStart, FX_INT32 yStart, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedPositionAdjustmentPattern(FX_INT32 xStart, FX_INT32 yStart, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedPositionDetectionPattern(FX_INT32 xStart, FX_INT32 yStart, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void EmbedPositionDetectionPatternsAndSeparators(CBC_CommonByteMatrix* matrix, FX_INT32 &e);

-    static void MaybeEmbedPositionAdjustmentPatterns(FX_INT32 version, CBC_CommonByteMatrix* matrix, FX_INT32 &e);

+                            int32_t version, int32_t maskPattern, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedBasicPatterns(int32_t version, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedTypeInfo(CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t maskPattern, CBC_CommonByteMatrix *matrix, int32_t &e);

+    static void EmbedDataBits(CBC_QRCoderBitVector* dataBits, int32_t maskPattern, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void MaybeEmbedVersionInfo(int32_t version, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static int32_t FindMSBSet(int32_t value);

+    static int32_t CalculateBCHCode(int32_t code, int32_t poly);

+    static void MakeTypeInfoBits(CBC_QRCoderErrorCorrectionLevel* ecLevel, int32_t maskPattern, CBC_QRCoderBitVector* bits, int32_t &e);

+    static void MakeVersionInfoBits(int32_t version, CBC_QRCoderBitVector* bits, int32_t &e);

+    static FX_BOOL IsEmpty(int32_t value);

+    static FX_BOOL IsValidValue(int32_t value);

+    static void EmbedTimingPatterns(CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedDarkDotAtLeftBottomCorner(CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedHorizontalSeparationPattern(int32_t xStart, int32_t yStart, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedVerticalSeparationPattern(int32_t xStart, int32_t yStart, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedPositionAdjustmentPattern(int32_t xStart, int32_t yStart, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedPositionDetectionPattern(int32_t xStart, int32_t yStart, CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void EmbedPositionDetectionPatternsAndSeparators(CBC_CommonByteMatrix* matrix, int32_t &e);

+    static void MaybeEmbedPositionAdjustmentPatterns(int32_t version, CBC_CommonByteMatrix* matrix, int32_t &e);

 };

 #endif