From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: 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 --- xfa/src/fxbarcode/pdf417/BC_PDF417Common.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417Common.h') diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h index 2d6258951e..a97d84b07a 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h @@ -11,20 +11,20 @@ class CBC_PDF417Common public: CBC_PDF417Common(); virtual ~CBC_PDF417Common(); - static FX_INT32 getBitCountSum(CFX_Int32Array& moduleBitCount); - static FX_INT32 getCodeword(FX_DWORD symbol); - static FX_INT32 NUMBER_OF_CODEWORDS; - static FX_INT32 MAX_CODEWORDS_IN_BARCODE; - static FX_INT32 MIN_ROWS_IN_BARCODE; - static FX_INT32 MAX_ROWS_IN_BARCODE; - static FX_INT32 MAX_CODEWORDS_IN_ROW; - static FX_INT32 MODULES_IN_CODEWORD; - static FX_INT32 MODULES_IN_STOP_PATTERN; - static FX_INT32 BARS_IN_MODULE; - static FX_INT32 SYMBOL_TABLE[]; - static FX_INT32 CODEWORD_TABLE[]; + static int32_t getBitCountSum(CFX_Int32Array& moduleBitCount); + static int32_t getCodeword(FX_DWORD symbol); + static int32_t NUMBER_OF_CODEWORDS; + static int32_t MAX_CODEWORDS_IN_BARCODE; + static int32_t MIN_ROWS_IN_BARCODE; + static int32_t MAX_ROWS_IN_BARCODE; + static int32_t MAX_CODEWORDS_IN_ROW; + static int32_t MODULES_IN_CODEWORD; + static int32_t MODULES_IN_STOP_PATTERN; + static int32_t BARS_IN_MODULE; + static int32_t SYMBOL_TABLE[]; + static int32_t CODEWORD_TABLE[]; private: static CFX_Int32Array* EMPTY_INT_ARRAY; - static FX_INT32 findCodewordIndex(FX_DWORD symbol); + static int32_t findCodewordIndex(FX_DWORD symbol); }; #endif -- cgit v1.2.3