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, 24 insertions, 24 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 3c24dc2bc9..72db2fe487 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
@@ -15,41 +15,41 @@ class CBC_QRCoder
 private:

     CBC_QRCoderMode* m_mode;

     CBC_QRCoderErrorCorrectionLevel* m_ecLevel;

-    FX_INT32 m_version;

-    FX_INT32 m_matrixWidth;

-    FX_INT32 m_maskPattern;

-    FX_INT32 m_numTotalBytes;

-    FX_INT32 m_numDataBytes;

-    FX_INT32 m_numECBytes;

-    FX_INT32 m_numRSBlocks;

+    int32_t m_version;

+    int32_t m_matrixWidth;

+    int32_t m_maskPattern;

+    int32_t m_numTotalBytes;

+    int32_t m_numDataBytes;

+    int32_t m_numECBytes;

+    int32_t m_numRSBlocks;

     CBC_CommonByteMatrix* m_matrix;

 public:

-    const static FX_INT32 NUM_MASK_PATTERNS;

+    const static int32_t NUM_MASK_PATTERNS;

     CBC_QRCoder();

     virtual ~CBC_QRCoder();

     CBC_QRCoderMode* GetMode();

     CBC_QRCoderErrorCorrectionLevel* GetECLevel();

-    FX_INT32 GetVersion();

-    FX_INT32 GetMatrixWidth();

-    FX_INT32 GetMaskPattern();

-    FX_INT32 GetNumTotalBytes();

-    FX_INT32 GetNumDataBytes();

-    FX_INT32 GetNumECBytes();

-    FX_INT32 GetNumRSBlocks();

+    int32_t GetVersion();

+    int32_t GetMatrixWidth();

+    int32_t GetMaskPattern();

+    int32_t GetNumTotalBytes();

+    int32_t GetNumDataBytes();

+    int32_t GetNumECBytes();

+    int32_t GetNumRSBlocks();

     CBC_CommonByteMatrix* GetMatrix();

-    FX_INT32 At(FX_INT32 x, FX_INT32 y, FX_INT32 &e);

+    int32_t At(int32_t x, int32_t y, int32_t &e);

     FX_BOOL IsValid();

 

     void SetMode(CBC_QRCoderMode* value);

     void SetECLevel(CBC_QRCoderErrorCorrectionLevel* ecLevel);

-    void SetVersion(FX_INT32 version);

-    void SetMatrixWidth(FX_INT32 width);

-    void SetMaskPattern(FX_INT32 pattern);

-    void SetNumDataBytes(FX_INT32 bytes);

-    void SetNumTotalBytes(FX_INT32 value);

-    void SetNumECBytes(FX_INT32 value);

-    void SetNumRSBlocks(FX_INT32 block);

+    void SetVersion(int32_t version);

+    void SetMatrixWidth(int32_t width);

+    void SetMaskPattern(int32_t pattern);

+    void SetNumDataBytes(int32_t bytes);

+    void SetNumTotalBytes(int32_t value);

+    void SetNumECBytes(int32_t value);

+    void SetNumRSBlocks(int32_t block);

     void SetMatrix(CBC_CommonByteMatrix* value);

-    static FX_BOOL IsValidMaskPattern(FX_INT32 maskPattern);

+    static FX_BOOL IsValidMaskPattern(int32_t maskPattern);

 };

 #endif