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

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index d0fde46542..f24d22bed2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -14,10 +14,10 @@ class CBC_QRFinderPatternInfo;
 class CBC_QRFinderPatternFinder

 {

 private:

-    const static FX_INT32 CENTER_QUORUM;

-    const static FX_INT32 MIN_SKIP;

-    const static FX_INT32 MAX_MODULES;

-    const static FX_INT32 INTEGER_MATH_SHIFT;

+    const static int32_t CENTER_QUORUM;

+    const static int32_t MIN_SKIP;

+    const static int32_t MAX_MODULES;

+    const static int32_t INTEGER_MATH_SHIFT;

     FX_BOOL m_hasSkipped;

     CBC_CommonBitMatrix* m_image;

     CFX_Int32Array m_crossCheckStateCount;

@@ -25,19 +25,19 @@ private:
 public:

     CBC_QRFinderPatternFinder(CBC_CommonBitMatrix *image);

     virtual ~CBC_QRFinderPatternFinder();

-    FX_INT32 FindRowSkip();

+    int32_t FindRowSkip();

     CBC_CommonBitMatrix* GetImage();

-    CBC_QRFinderPatternInfo* Find(FX_INT32 hint, FX_INT32 &e);

+    CBC_QRFinderPatternInfo* Find(int32_t hint, int32_t &e);

 

     CFX_Int32Array &GetCrossCheckStateCount();

     CFX_PtrArray *GetPossibleCenters();

-    CFX_PtrArray *SelectBestpatterns(FX_INT32 &e);

+    CFX_PtrArray *SelectBestpatterns(int32_t &e);

 

-    FX_BOOL HandlePossibleCenter(const CFX_Int32Array &stateCount, FX_INT32 i, FX_INT32 j);

+    FX_BOOL HandlePossibleCenter(const CFX_Int32Array &stateCount, int32_t i, int32_t j);

     FX_BOOL HaveMultiplyConfirmedCenters();

-    FX_FLOAT CenterFromEnd(const CFX_Int32Array &stateCount, FX_INT32 end);

-    FX_FLOAT CrossCheckVertical(FX_INT32 startI, FX_INT32 centerJ, FX_INT32 maxCount, FX_INT32 originalStateCountTotal);

-    FX_FLOAT CrossCheckHorizontal(FX_INT32 startJ, FX_INT32 CenterI, FX_INT32 maxCOunt, FX_INT32 originalStateCountTotal);

+    FX_FLOAT CenterFromEnd(const CFX_Int32Array &stateCount, int32_t end);

+    FX_FLOAT CrossCheckVertical(int32_t startI, int32_t centerJ, int32_t maxCount, int32_t originalStateCountTotal);

+    FX_FLOAT CrossCheckHorizontal(int32_t startJ, int32_t CenterI, int32_t maxCOunt, int32_t originalStateCountTotal);

     static void OrderBestPatterns(CFX_PtrArray *patterns);

     static FX_BOOL FoundPatternCross(const CFX_Int32Array &stateCount);

     static FX_FLOAT Distance(CBC_ResultPoint* point1, CBC_ResultPoint* point2);