summaryrefslogtreecommitdiff
path: root/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
commitbfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch)
tree4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
parentb116136da234afcad018bb44a3ccb64b9ad2a554 (diff)
downloadpdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz
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
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h')
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index 812aa6424f..da9fdc7db5 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -14,17 +14,17 @@ public:
CBC_DataMatrixBitMatrixParser();
virtual ~CBC_DataMatrixBitMatrixParser();
CBC_DataMatrixVersion *GetVersion();
- CFX_ByteArray *ReadCodewords(FX_INT32 &e);
- FX_BOOL ReadModule(FX_INT32 row, FX_INT32 column, FX_INT32 numRows, FX_INT32 numColumns);
- FX_INT32 ReadUtah(FX_INT32 row, FX_INT32 column, FX_INT32 numRows, FX_INT32 numColumns);
- FX_INT32 ReadCorner1(FX_INT32 numRows, FX_INT32 numColumns);
- FX_INT32 ReadCorner2(FX_INT32 numRows, FX_INT32 numColumns);
- FX_INT32 ReadCorner3(FX_INT32 numRows, FX_INT32 numColumns);
- FX_INT32 ReadCorner4(FX_INT32 numRows, FX_INT32 numColumns);
- CBC_CommonBitMatrix *ExtractDataRegion(CBC_CommonBitMatrix *bitMatrix, FX_INT32 &e);
- virtual void Init(CBC_CommonBitMatrix *bitMatrix, FX_INT32 &e);
+ CFX_ByteArray *ReadCodewords(int32_t &e);
+ FX_BOOL ReadModule(int32_t row, int32_t column, int32_t numRows, int32_t numColumns);
+ int32_t ReadUtah(int32_t row, int32_t column, int32_t numRows, int32_t numColumns);
+ int32_t ReadCorner1(int32_t numRows, int32_t numColumns);
+ int32_t ReadCorner2(int32_t numRows, int32_t numColumns);
+ int32_t ReadCorner3(int32_t numRows, int32_t numColumns);
+ int32_t ReadCorner4(int32_t numRows, int32_t numColumns);
+ CBC_CommonBitMatrix *ExtractDataRegion(CBC_CommonBitMatrix *bitMatrix, int32_t &e);
+ virtual void Init(CBC_CommonBitMatrix *bitMatrix, int32_t &e);
private:
- static CBC_DataMatrixVersion* ReadVersion(CBC_CommonBitMatrix *bitMatrix, FX_INT32 &e);
+ static CBC_DataMatrixVersion* ReadVersion(CBC_CommonBitMatrix *bitMatrix, int32_t &e);
CBC_CommonBitMatrix *m_mappingBitMatrix;
CBC_CommonBitMatrix *m_readMappingMatrix;
CBC_DataMatrixVersion *m_version;