From f47444256898ed42e01accffa9c97a4dd82c9013 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Tue, 21 Aug 2018 21:36:55 +0000 Subject: Remove dead code in CBC_CommonBitMatrix. Change-Id: Ie22666217b040872e576d58d0afa77138bca3870 Reviewed-on: https://pdfium-review.googlesource.com/40931 Reviewed-by: Lei Zhang Commit-Queue: Henrique Nakashima --- fxbarcode/common/BC_CommonBitMatrix.cpp | 53 +-------------------------------- fxbarcode/common/BC_CommonBitMatrix.h | 7 ----- 2 files changed, 1 insertion(+), 59 deletions(-) (limited to 'fxbarcode') diff --git a/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp index 54b1affa71..c21dfb36af 100644 --- a/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -32,19 +32,10 @@ CBC_CommonBitMatrix::CBC_CommonBitMatrix() {} -void CBC_CommonBitMatrix::Init(int32_t dimension) { - m_width = dimension; - m_height = dimension; - int32_t rowSize = (m_height + 31) >> 5; - m_rowSize = rowSize; - m_bits = pdfium::Vector2D(m_rowSize, m_height); -} - void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) { m_width = width; m_height = height; - int32_t rowSize = (width + 31) >> 5; - m_rowSize = rowSize; + m_rowSize = (width + 31) >> 5; m_bits = pdfium::Vector2D(m_rowSize, m_height); } @@ -63,45 +54,3 @@ void CBC_CommonBitMatrix::Set(int32_t x, int32_t y) { ASSERT(offset < m_rowSize * m_height); m_bits[offset] |= 1 << (x & 0x1f); } - -void CBC_CommonBitMatrix::Flip(int32_t x, int32_t y) { - int32_t offset = y * m_rowSize + (x >> 5); - m_bits[offset] ^= 1 << (x & 0x1f); -} - -void CBC_CommonBitMatrix::Clear() { - std::fill(std::begin(m_bits), std::end(m_bits), 0); -} - -bool CBC_CommonBitMatrix::SetRegion(int32_t left, - int32_t top, - int32_t width, - int32_t height) { - if (top < 0 || left < 0 || height < 1 || width < 1) - return false; - - int32_t right = left + width; - int32_t bottom = top + height; - if (m_height < bottom || m_width < right) - return false; - - for (int32_t y = top; y < bottom; y++) { - int32_t offset = y * m_rowSize; - for (int32_t x = left; x < right; x++) - m_bits[offset + (x >> 5)] |= 1 << (x & 0x1f); - } - return true; -} - -void CBC_CommonBitMatrix::SetRow(int32_t y, CBC_CommonBitArray* row) { - int32_t l = y * m_rowSize; - for (int32_t i = 0; i < m_rowSize; i++) { - m_bits[l] = row->GetBitArray()[i]; - l++; - } -} - -void CBC_CommonBitMatrix::SetCol(int32_t y, CBC_CommonBitArray* col) { - for (size_t i = 0; i < col->GetBits().size(); ++i) - m_bits[i * m_rowSize + y] = col->GetBitArray()[i]; -} diff --git a/fxbarcode/common/BC_CommonBitMatrix.h b/fxbarcode/common/BC_CommonBitMatrix.h index 51c3728a7a..5b22de2c25 100644 --- a/fxbarcode/common/BC_CommonBitMatrix.h +++ b/fxbarcode/common/BC_CommonBitMatrix.h @@ -18,17 +18,10 @@ class CBC_CommonBitMatrix { CBC_CommonBitMatrix(); ~CBC_CommonBitMatrix(); - void Init(int32_t dimension); void Init(int32_t width, int32_t height); bool Get(int32_t x, int32_t y) const; void Set(int32_t x, int32_t y); - void Flip(int32_t x, int32_t y); - void Clear(); - bool SetRegion(int32_t left, int32_t top, int32_t width, int32_t height); - void SetRow(int32_t y, CBC_CommonBitArray* row); - CBC_CommonBitArray* GetCol(int32_t y, CBC_CommonBitArray* row); - void SetCol(int32_t y, CBC_CommonBitArray* col); int32_t GetWidth() const { return m_width; } int32_t GetHeight() const { return m_height; } -- cgit v1.2.3