From d19e912dd469e4bdad9f3020e1f6eb98f10f3470 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 2 Nov 2016 15:43:18 -0700 Subject: Remove FX_BOOL from xfa. Review-Url: https://codereview.chromium.org/2467203003 --- xfa/fxbarcode/common/BC_CommonBitArray.cpp | 18 +++++++++--------- xfa/fxbarcode/common/BC_CommonBitArray.h | 4 ++-- xfa/fxbarcode/common/BC_CommonBitMatrix.cpp | 2 +- xfa/fxbarcode/common/BC_CommonBitMatrix.h | 2 +- xfa/fxbarcode/common/BC_CommonByteArray.cpp | 2 +- xfa/fxbarcode/common/BC_CommonByteArray.h | 2 +- .../common/reedsolomon/BC_ReedSolomonGF256Poly.cpp | 2 +- .../common/reedsolomon/BC_ReedSolomonGF256Poly.h | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'xfa/fxbarcode/common') diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/fxbarcode/common/BC_CommonBitArray.cpp index b39e4acd88..722bbc501d 100644 --- a/xfa/fxbarcode/common/BC_CommonBitArray.cpp +++ b/xfa/fxbarcode/common/BC_CommonBitArray.cpp @@ -47,7 +47,7 @@ CFX_Int32Array& CBC_CommonBitArray::GetBits() { int32_t CBC_CommonBitArray::GetSizeInBytes() { return (m_size + 7) >> 3; } -FX_BOOL CBC_CommonBitArray::Get(int32_t i) { +bool CBC_CommonBitArray::Get(int32_t i) { return (m_bits[i >> 5] & (1 << (i & 0x1f))) != 0; } void CBC_CommonBitArray::Set(int32_t i) { @@ -62,16 +62,16 @@ void CBC_CommonBitArray::SetBulk(int32_t i, int32_t newBits) { void CBC_CommonBitArray::Clear() { FXSYS_memset(&m_bits[0], 0x00, m_bits.GetSize() * sizeof(int32_t)); } -FX_BOOL CBC_CommonBitArray::IsRange(int32_t start, - int32_t end, - FX_BOOL value, - int32_t& e) { +bool CBC_CommonBitArray::IsRange(int32_t start, + int32_t end, + bool value, + int32_t& e) { if (end < start) { e = BCExceptionEndLessThanStart; - return FALSE; + return false; } if (end == start) { - return TRUE; + return true; } end--; int32_t firstInt = start >> 5; @@ -90,10 +90,10 @@ FX_BOOL CBC_CommonBitArray::IsRange(int32_t start, } } if ((m_bits[i] & mask) != (value ? mask : 0)) { - return FALSE; + return false; } } - return TRUE; + return true; } int32_t* CBC_CommonBitArray::GetBitArray() { return &m_bits[0]; diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.h b/xfa/fxbarcode/common/BC_CommonBitArray.h index 6955d5b288..80a56d1b53 100644 --- a/xfa/fxbarcode/common/BC_CommonBitArray.h +++ b/xfa/fxbarcode/common/BC_CommonBitArray.h @@ -19,11 +19,11 @@ class CBC_CommonBitArray { int32_t GetSize(); CFX_Int32Array& GetBits(); int32_t GetSizeInBytes(); - FX_BOOL Get(int32_t i); + bool Get(int32_t i); void Set(int32_t i); void Flip(int32_t i); void SetBulk(int32_t i, int32_t newBits); - FX_BOOL IsRange(int32_t start, int32_t end, FX_BOOL value, int32_t& e); + bool IsRange(int32_t start, int32_t end, bool value, int32_t& e); int32_t* GetBitArray(); void Reverse(); void Clear(); diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp index e52f3dca04..b9b218c60f 100644 --- a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -49,7 +49,7 @@ void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) { CBC_CommonBitMatrix::~CBC_CommonBitMatrix() { FX_Free(m_bits); } -FX_BOOL CBC_CommonBitMatrix::Get(int32_t x, int32_t y) { +bool CBC_CommonBitMatrix::Get(int32_t x, int32_t y) { int32_t offset = y * m_rowSize + (x >> 5); if (offset >= m_rowSize * m_height || offset < 0) { return false; diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/fxbarcode/common/BC_CommonBitMatrix.h index 98291f0130..ed1f684a37 100644 --- a/xfa/fxbarcode/common/BC_CommonBitMatrix.h +++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.h @@ -19,7 +19,7 @@ class CBC_CommonBitMatrix { virtual void Init(int32_t dimension); virtual void Init(int32_t width, int32_t height); - FX_BOOL Get(int32_t x, int32_t y); + bool Get(int32_t x, int32_t y); void Set(int32_t x, int32_t y); void Flip(int32_t x, int32_t y); void Clear(); diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/fxbarcode/common/BC_CommonByteArray.cpp index afa8ac6836..71fa85f0c4 100644 --- a/xfa/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/fxbarcode/common/BC_CommonByteArray.cpp @@ -53,7 +53,7 @@ void CBC_CommonByteArray::Set(int32_t index, int32_t value) { int32_t CBC_CommonByteArray::Size() const { return m_size; } -FX_BOOL CBC_CommonByteArray::IsEmpty() const { +bool CBC_CommonByteArray::IsEmpty() const { return m_size == 0; } void CBC_CommonByteArray::AppendByte(int32_t value) { diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.h b/xfa/fxbarcode/common/BC_CommonByteArray.h index bdac6a6963..dd6ee581ef 100644 --- a/xfa/fxbarcode/common/BC_CommonByteArray.h +++ b/xfa/fxbarcode/common/BC_CommonByteArray.h @@ -20,7 +20,7 @@ class CBC_CommonByteArray { int32_t At(int32_t index) const; int32_t Size() const; - FX_BOOL IsEmpty() const; + bool IsEmpty() const; void Set(int32_t index, int32_t value); void AppendByte(int32_t value); void Reserve(int32_t capacity); diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index 0e376ce1a8..60f1f1bbed 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -70,7 +70,7 @@ CFX_Int32Array* CBC_ReedSolomonGF256Poly::GetCoefficients() { int32_t CBC_ReedSolomonGF256Poly::GetDegree() { return m_coefficients.GetSize() - 1; } -FX_BOOL CBC_ReedSolomonGF256Poly::IsZero() { +bool CBC_ReedSolomonGF256Poly::IsZero() { return m_coefficients[0] == 0; } int32_t CBC_ReedSolomonGF256Poly::GetCoefficients(int32_t degree) { diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index 3e840f528b..3eff31b622 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -23,7 +23,7 @@ class CBC_ReedSolomonGF256Poly final { int32_t GetCoefficients(int32_t degree); CFX_Int32Array* GetCoefficients(); int32_t GetDegree(); - FX_BOOL IsZero(); + bool IsZero(); int32_t EvaluateAt(int32_t a); CBC_ReedSolomonGF256Poly* AddOrSubtract(CBC_ReedSolomonGF256Poly* other, int32_t& e); -- cgit v1.2.3