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

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 40e7ffef28..141c3dab36 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -14,20 +14,20 @@ public:
     static void Finalize();

     static CBC_ReedSolomonGF256 *QRCodeFild;

     static CBC_ReedSolomonGF256 *DataMatrixField;

-    CBC_ReedSolomonGF256(FX_INT32 primitive);

+    CBC_ReedSolomonGF256(int32_t primitive);

     virtual ~CBC_ReedSolomonGF256();

     CBC_ReedSolomonGF256Poly* GetZero();

     CBC_ReedSolomonGF256Poly* GetOne();

-    CBC_ReedSolomonGF256Poly* BuildMonomial(FX_INT32 degree, FX_INT32 coefficient, FX_INT32 &e);

-    static FX_INT32 AddOrSubtract(FX_INT32 a, FX_INT32 b);

-    FX_INT32 Exp(FX_INT32 a);

-    FX_INT32 Log(FX_INT32 a, FX_INT32 &e);

-    FX_INT32 Inverse(FX_INT32 a, FX_INT32 &e);

-    FX_INT32 Multiply(FX_INT32 a, FX_INT32 b);

+    CBC_ReedSolomonGF256Poly* BuildMonomial(int32_t degree, int32_t coefficient, int32_t &e);

+    static int32_t AddOrSubtract(int32_t a, int32_t b);

+    int32_t Exp(int32_t a);

+    int32_t Log(int32_t a, int32_t &e);

+    int32_t Inverse(int32_t a, int32_t &e);

+    int32_t Multiply(int32_t a, int32_t b);

     virtual void Init();

 private:

-    FX_INT32 m_expTable[256];

-    FX_INT32 m_logTable[256];

+    int32_t m_expTable[256];

+    int32_t m_logTable[256];

     CBC_ReedSolomonGF256Poly *m_zero;

     CBC_ReedSolomonGF256Poly *m_one;

 };