summaryrefslogtreecommitdiff
path: root/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2017-01-20 12:59:50 -0800
committerCommit bot <commit-bot@chromium.org>2017-01-20 12:59:50 -0800
commit82aa396188ec26f22fe730f4e35b5a54ebffb5dc (patch)
tree3950a96204c68fed27d1812cdd9d30de1a6226c0 /xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
parent6db6fbcdee9f1887ac02c647210bd5013358f12d (diff)
downloadpdfium-82aa396188ec26f22fe730f4e35b5a54ebffb5dc.tar.xz
Replace CFX_ByteArray with CFX_ArrayTemplate<uint8_t>chromium/2990chromium/2989chromium/2988
Also replace CFX_Int32Array typedef with CFX_ArrayTemplate<int32_t>. Removing the typedefs makes subsequent conversion to std::vector<> easier on a case-by-case basis. Review-Url: https://codereview.chromium.org/2649563003
Diffstat (limited to 'xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp')
-rw-r--r--xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index f348d2c934..c1f4da1e3b 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -59,16 +59,16 @@ int32_t CBC_BarcodeMatrix::getWidth() {
int32_t CBC_BarcodeMatrix::getHeight() {
return m_outHeight;
}
-CFX_ByteArray& CBC_BarcodeMatrix::getMatrix() {
+CFX_ArrayTemplate<uint8_t>& CBC_BarcodeMatrix::getMatrix() {
return getScaledMatrix(1, 1);
}
-CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t scale) {
+CFX_ArrayTemplate<uint8_t>& CBC_BarcodeMatrix::getScaledMatrix(int32_t scale) {
return getScaledMatrix(scale, scale);
}
-CFX_ByteArray& CBC_BarcodeMatrix::getScaledMatrix(int32_t xScale,
- int32_t yScale) {
+CFX_ArrayTemplate<uint8_t>& CBC_BarcodeMatrix::getScaledMatrix(int32_t xScale,
+ int32_t yScale) {
int32_t yMax = m_height * yScale;
- CFX_ByteArray bytearray;
+ CFX_ArrayTemplate<uint8_t> bytearray;
bytearray.Copy(m_matrix[0]->getScaledRow(xScale));
int32_t xMax = bytearray.GetSize();
m_matrixOut.SetSize(xMax * yMax);