From 8b6186f89002099d406508acecf4bccc4ef64c95 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Mar 2017 12:06:45 -0700 Subject: Remove CFX_ArrayTemplate from FX barcode code. This is now the last usage in pdfium, types to be removed in a follow-on CL. Change-Id: I16f67eb3eb99f21bb231829168203be125129ad7 Reviewed-on: https://pdfium-review.googlesource.com/3247 Reviewed-by: dsinclair Commit-Queue: dsinclair --- xfa/fxbarcode/common/BC_CommonBitMatrix.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fxbarcode/common/BC_CommonBitMatrix.cpp') diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp index b9b218c60f..5e65bd74cf 100644 --- a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -104,7 +104,7 @@ void CBC_CommonBitMatrix::SetRegion(int32_t left, CBC_CommonBitArray* CBC_CommonBitMatrix::GetRow(int32_t y, CBC_CommonBitArray* row) { CBC_CommonBitArray* rowArray = nullptr; - if (!row || row->GetSize() < m_width) { + if (!row || static_cast(row->GetSize()) < m_width) { rowArray = new CBC_CommonBitArray(m_width); } else { rowArray = new CBC_CommonBitArray(row); @@ -123,11 +123,12 @@ void CBC_CommonBitMatrix::SetRow(int32_t y, CBC_CommonBitArray* row) { l++; } } + void CBC_CommonBitMatrix::SetCol(int32_t y, CBC_CommonBitArray* col) { - for (int32_t i = 0; i < col->GetBits().GetSize(); i++) { + for (size_t i = 0; i < col->GetBits().size(); ++i) m_bits[i * m_rowSize + y] = col->GetBitArray()[i]; - } } + int32_t CBC_CommonBitMatrix::GetWidth() { return m_width; } -- cgit v1.2.3