diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-08-21 21:04:26 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-21 21:04:26 +0000 |
| commit | b10aff29932d434b3e333f6a92d7d6edf574963d (patch) | |
| tree | 04d715dfe02e9a95038f45450288d4316dac92a8 /fxbarcode | |
| parent | 3cfe89d632315b6bdae3264cc75fc5ed06d36f45 (diff) | |
| download | pdfium-b10aff29932d434b3e333f6a92d7d6edf574963d.tar.xz | |
Remove excessive padding above and below PDF417 barcodes.
Bug: pdfium:1135
Change-Id: Iea16a65a5eebcb914192eb49de17a2c4eda83320
Reviewed-on: https://pdfium-review.googlesource.com/40690
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxbarcode')
| -rw-r--r-- | fxbarcode/pdf417/BC_PDF417.cpp | 2 | ||||
| -rw-r--r-- | fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp | 6 | ||||
| -rw-r--r-- | fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fxbarcode/pdf417/BC_PDF417.cpp b/fxbarcode/pdf417/BC_PDF417.cpp index d0ecaccf55..084f3a8810 100644 --- a/fxbarcode/pdf417/BC_PDF417.cpp +++ b/fxbarcode/pdf417/BC_PDF417.cpp @@ -506,7 +506,6 @@ void CBC_PDF417::encodeLowLevel(WideString fullCodewords, int32_t idx = 0; for (int32_t y = 0; y < r; y++) { int32_t cluster = y % 3; - logic->startRow(); encodeChar(START_PATTERN, 17, logic->getCurrentRow()); int32_t left; int32_t right; @@ -534,6 +533,7 @@ void CBC_PDF417::encodeLowLevel(WideString fullCodewords, encodeChar(pattern, 17, logic->getCurrentRow()); encodeChar(STOP_PATTERN, 18, logic->getCurrentRow()); } + logic->nextRow(); } } diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index ca492b3c19..ebedbf6197 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -25,12 +25,12 @@ #include "third_party/base/ptr_util.h" CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { - m_matrix.resize(height + 2); + m_matrix.resize(height); 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; + m_height = height; m_currentRow = 0; m_outHeight = 0; m_outWidth = 0; @@ -44,7 +44,7 @@ void CBC_BarcodeMatrix::set(int32_t x, int32_t y, uint8_t value) { void CBC_BarcodeMatrix::setMatrix(int32_t x, int32_t y, bool black) { set(x, y, (uint8_t)(black ? 1 : 0)); } -void CBC_BarcodeMatrix::startRow() { +void CBC_BarcodeMatrix::nextRow() { ++m_currentRow; } std::vector<uint8_t>& CBC_BarcodeMatrix::getMatrix() { diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index 71ada98872..4f6591ed55 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -23,7 +23,7 @@ class CBC_BarcodeMatrix { 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(); + void nextRow(); std::vector<uint8_t>& getMatrix(); std::vector<uint8_t>& getScaledMatrix(int32_t scale); std::vector<uint8_t>& getScaledMatrix(int32_t xScale, int32_t yScale); |