diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-03-28 12:06:45 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-28 19:22:50 +0000 |
commit | 8b6186f89002099d406508acecf4bccc4ef64c95 (patch) | |
tree | df104ee415cfa90a53a23b88f1f66c3c2fd8d84e /xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | |
parent | b0baff546bdcd911c80007829d9af5f05d0c04b0 (diff) | |
download | pdfium-8b6186f89002099d406508acecf4bccc4ef64c95.tar.xz |
Remove CFX_ArrayTemplate from FX barcode code.
This is now the last usage in pdfium, types to be removed
in a follow-on CL.
Change-Id: I16f67eb3eb99f21bb231829168203be125129ad7
Reviewed-on: https://pdfium-review.googlesource.com/3247
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h')
-rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index 95ab547c90..bf86b7b55a 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -7,6 +7,8 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ +#include <vector> + #include "core/fxcrt/fx_basic.h" class CBC_BarcodeRow; @@ -21,15 +23,15 @@ class CBC_BarcodeMatrix { void setMatrix(int32_t x, int32_t y, bool black); void startRow(); CBC_BarcodeRow* getCurrentRow(); - CFX_ArrayTemplate<uint8_t>& getMatrix(); - CFX_ArrayTemplate<uint8_t>& getScaledMatrix(int32_t scale); - CFX_ArrayTemplate<uint8_t>& getScaledMatrix(int32_t xScale, int32_t yScale); + std::vector<uint8_t>& getMatrix(); + std::vector<uint8_t>& getScaledMatrix(int32_t scale); + std::vector<uint8_t>& getScaledMatrix(int32_t xScale, int32_t yScale); int32_t getWidth(); int32_t getHeight(); private: - CFX_ArrayTemplate<CBC_BarcodeRow*> m_matrix; - CFX_ArrayTemplate<uint8_t> m_matrixOut; + std::vector<CBC_BarcodeRow*> m_matrix; + std::vector<uint8_t> m_matrixOut; int32_t m_currentRow; int32_t m_height; int32_t m_width; |