summaryrefslogtreecommitdiff
path: root/fxbarcode
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2018-08-23 20:47:16 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-23 20:47:16 +0000
commit3b45012d57884b06915eb5a1f54fbba04a45e807 (patch)
treed338ee678993d9192ca1d7419b7f1e63e9bfb818 /fxbarcode
parente919ec18fc0b008241e5e5371d5762e9fe89de6f (diff)
downloadpdfium-3b45012d57884b06915eb5a1f54fbba04a45e807.tar.xz
Remove CBC_BarcodeMatrix::m_matrixOut and just return the bit array.
Change-Id: I12893784321f92e5cac2b80653897007b6e63c7e Reviewed-on: https://pdfium-review.googlesource.com/41111 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxbarcode')
-rw-r--r--fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp8
-rw-r--r--fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h3
-rw-r--r--fxbarcode/pdf417/BC_PDF417Writer.cpp2
3 files changed, 6 insertions, 7 deletions
diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 1d05486f30..70e7cd9598 100644
--- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -33,12 +33,12 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(size_t width, size_t height)
CBC_BarcodeMatrix::~CBC_BarcodeMatrix() {}
-std::vector<uint8_t>& CBC_BarcodeMatrix::getMatrix() {
- m_matrixOut.resize(m_width * m_height);
+std::vector<uint8_t> CBC_BarcodeMatrix::toBitArray() {
+ std::vector<uint8_t> bitArray(m_width * m_height);
for (size_t i = 0; i < m_height; ++i) {
std::vector<uint8_t>& bytearray = m_matrix[i]->getRow();
for (size_t j = 0; j < m_width; ++j)
- m_matrixOut[i * m_width + j] = bytearray[j];
+ bitArray[i * m_width + j] = bytearray[j];
}
- return m_matrixOut;
+ return bitArray;
}
diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index 1359ac2e63..60978391cb 100644
--- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -20,11 +20,10 @@ class CBC_BarcodeMatrix {
CBC_BarcodeRow* getRow(size_t row) const { return m_matrix[row].get(); }
size_t getWidth() const { return m_width; }
size_t getHeight() const { return m_height; }
- std::vector<uint8_t>& getMatrix();
+ std::vector<uint8_t> toBitArray();
private:
std::vector<std::unique_ptr<CBC_BarcodeRow>> m_matrix;
- std::vector<uint8_t> m_matrixOut;
size_t m_width;
size_t m_height;
};
diff --git a/fxbarcode/pdf417/BC_PDF417Writer.cpp b/fxbarcode/pdf417/BC_PDF417Writer.cpp
index 129d59c393..479bc2cd85 100644
--- a/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -62,7 +62,7 @@ uint8_t* CBC_PDF417Writer::Encode(const WideString& contents,
return nullptr;
CBC_BarcodeMatrix* barcodeMatrix = encoder.getBarcodeMatrix();
- std::vector<uint8_t> matrixData = barcodeMatrix->getMatrix();
+ std::vector<uint8_t> matrixData = barcodeMatrix->toBitArray();
int32_t matrixWidth = barcodeMatrix->getWidth();
int32_t matrixHeight = barcodeMatrix->getHeight();