summaryrefslogtreecommitdiff
path: root/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-05-01 14:06:10 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-02 13:59:36 +0000
commit0804b3f5114ff09df9b10207997e1f16c868b45e (patch)
tree59c6a06f89fe78ccab51b954386a03d8d7625aa2 /fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
parent40baddef7fda756c29b813dc1fd67b28d745aa8c (diff)
downloadpdfium-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.cpp')
-rw-r--r--fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp19
1 files changed, 4 insertions, 15 deletions
diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 564d7ef0b1..ca492b3c19 100644
--- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -22,11 +22,12 @@
#include "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
#include "fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "third_party/base/ptr_util.h"
CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
m_matrix.resize(height + 2);
- for (size_t i = 0, matrixLength = m_matrix.size(); i < matrixLength; ++i)
- m_matrix[i] = new CBC_BarcodeRow((width + 4) * 17 + 1);
+ for (size_t i = 0; i < m_matrix.size(); ++i)
+ m_matrix[i] = pdfium::MakeUnique<CBC_BarcodeRow>((width + 4) * 17 + 1);
m_width = width * 17;
m_height = height + 2;
@@ -35,10 +36,7 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
m_outWidth = 0;
}
-CBC_BarcodeMatrix::~CBC_BarcodeMatrix() {
- for (size_t i = 0; i < m_matrix.size(); i++)
- delete m_matrix[i];
-}
+CBC_BarcodeMatrix::~CBC_BarcodeMatrix() {}
void CBC_BarcodeMatrix::set(int32_t x, int32_t y, uint8_t value) {
m_matrix[y]->set(x, value);
@@ -49,15 +47,6 @@ void CBC_BarcodeMatrix::setMatrix(int32_t x, int32_t y, bool black) {
void CBC_BarcodeMatrix::startRow() {
++m_currentRow;
}
-CBC_BarcodeRow* CBC_BarcodeMatrix::getCurrentRow() {
- return m_matrix[m_currentRow];
-}
-int32_t CBC_BarcodeMatrix::getWidth() {
- return m_outWidth;
-}
-int32_t CBC_BarcodeMatrix::getHeight() {
- return m_outHeight;
-}
std::vector<uint8_t>& CBC_BarcodeMatrix::getMatrix() {
return getScaledMatrix(1, 1);
}