From 1b22880748c3f3b3740699ae4c953a33f65ad10f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 5 Apr 2017 18:42:22 -0700 Subject: Change some fxbarcode to use return values. No caller cares about the exception values anyway. Remove the unused ones. Also use more std::unique_ptr to stop potential leaks. Change-Id: Ic5955fb0d879f55e1c6a005c0204df50246dab19 Reviewed-on: https://pdfium-review.googlesource.com/3715 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fxbarcode/common/BC_CommonBitMatrix.h | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'fxbarcode/common/BC_CommonBitMatrix.h') diff --git a/fxbarcode/common/BC_CommonBitMatrix.h b/fxbarcode/common/BC_CommonBitMatrix.h index 2bb3f64843..744461903d 100644 --- a/fxbarcode/common/BC_CommonBitMatrix.h +++ b/fxbarcode/common/BC_CommonBitMatrix.h @@ -14,35 +14,30 @@ class CBC_CommonBitArray; class CBC_CommonBitMatrix { public: CBC_CommonBitMatrix(); - virtual ~CBC_CommonBitMatrix(); + ~CBC_CommonBitMatrix(); - virtual void Init(int32_t dimension); - virtual void Init(int32_t width, int32_t height); + void Init(int32_t dimension); + void Init(int32_t width, int32_t height); - bool Get(int32_t x, int32_t y); + 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(); - void SetRegion(int32_t left, - int32_t top, - int32_t width, - int32_t height, - int32_t& e); + bool SetRegion(int32_t left, int32_t top, int32_t width, int32_t height); CBC_CommonBitArray* GetRow(int32_t y, CBC_CommonBitArray* row); 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(); - int32_t GetHeight(); - int32_t GetRowSize(); - int32_t GetDimension(int32_t& e); + int32_t GetWidth() const; + int32_t GetHeight() const; + int32_t GetRowSize() const; int32_t* GetBits(); private: - int32_t m_width; - int32_t m_height; - int32_t m_rowSize; - int32_t* m_bits; + int32_t m_width = 0; + int32_t m_height = 0; + int32_t m_rowSize = 0; + int32_t* m_bits = nullptr; }; #endif // FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_ -- cgit v1.2.3