diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-01 14:06:10 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-02 13:59:36 +0000 |
| commit | 0804b3f5114ff09df9b10207997e1f16c868b45e (patch) | |
| tree | 59c6a06f89fe78ccab51b954386a03d8d7625aa2 /fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | |
| parent | 40baddef7fda756c29b813dc1fd67b28d745aa8c (diff) | |
| download | pdfium-0804b3f5114ff09df9b10207997e1f16c868b45e.tar.xz | |
Remove more |new|s, part 7
Remove some dead code along the way.
Move some getters to headers and make const.
Change-Id: I14280c247b0cfeff8ad7f606302bc8bba1960f1e
Reviewed-on: https://pdfium-review.googlesource.com/4730
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h')
| -rw-r--r-- | fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index 964048db9f..785633d150 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -7,6 +7,7 @@ #ifndef FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ #define FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ +#include <memory> #include <vector> #include "core/fxcrt/fx_basic.h" @@ -19,18 +20,18 @@ class CBC_BarcodeMatrix { CBC_BarcodeMatrix(int32_t height, int32_t width); virtual ~CBC_BarcodeMatrix(); + CBC_BarcodeRow* getCurrentRow() const { return m_matrix[m_currentRow].get(); } + int32_t getWidth() const { return m_outWidth; } + int32_t getHeight() const { return m_outHeight; } void set(int32_t x, int32_t y, uint8_t value); void setMatrix(int32_t x, int32_t y, bool black); void startRow(); - CBC_BarcodeRow* getCurrentRow(); 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: - std::vector<CBC_BarcodeRow*> m_matrix; + std::vector<std::unique_ptr<CBC_BarcodeRow>> m_matrix; std::vector<uint8_t> m_matrixOut; int32_t m_currentRow; int32_t m_height; |