diff options
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_BitStream.cpp')
-rw-r--r-- | core/fxcodec/jbig2/JBig2_BitStream.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.cpp b/core/fxcodec/jbig2/JBig2_BitStream.cpp index 3346521aca..67d82f49a7 100644 --- a/core/fxcodec/jbig2/JBig2_BitStream.cpp +++ b/core/fxcodec/jbig2/JBig2_BitStream.cpp @@ -27,7 +27,7 @@ CJBig2_BitStream::CJBig2_BitStream(CPDF_StreamAcc* pSrcStream) CJBig2_BitStream::~CJBig2_BitStream() {} int32_t CJBig2_BitStream::readNBits(uint32_t dwBits, uint32_t* dwResult) { - if (!IsInBound()) + if (!IsInBounds()) return -1; uint32_t dwBitPos = getBitPos(); @@ -49,7 +49,7 @@ int32_t CJBig2_BitStream::readNBits(uint32_t dwBits, uint32_t* dwResult) { } int32_t CJBig2_BitStream::readNBits(uint32_t dwBits, int32_t* nResult) { - if (!IsInBound()) + if (!IsInBounds()) return -1; uint32_t dwBitPos = getBitPos(); @@ -71,7 +71,7 @@ int32_t CJBig2_BitStream::readNBits(uint32_t dwBits, int32_t* nResult) { } int32_t CJBig2_BitStream::read1Bit(uint32_t* dwResult) { - if (!IsInBound()) + if (!IsInBounds()) return -1; *dwResult = (m_pBuf[m_dwByteIdx] >> (7 - m_dwBitIdx)) & 0x01; @@ -80,7 +80,7 @@ int32_t CJBig2_BitStream::read1Bit(uint32_t* dwResult) { } int32_t CJBig2_BitStream::read1Bit(bool* bResult) { - if (!IsInBound()) + if (!IsInBounds()) return -1; *bResult = (m_pBuf[m_dwByteIdx] >> (7 - m_dwBitIdx)) & 0x01; @@ -89,7 +89,7 @@ int32_t CJBig2_BitStream::read1Bit(bool* bResult) { } int32_t CJBig2_BitStream::read1Byte(uint8_t* cResult) { - if (!IsInBound()) + if (!IsInBounds()) return -1; *cResult = m_pBuf[m_dwByteIdx]; @@ -124,16 +124,16 @@ void CJBig2_BitStream::alignByte() { } uint8_t CJBig2_BitStream::getCurByte() const { - return IsInBound() ? m_pBuf[m_dwByteIdx] : 0; + return IsInBounds() ? m_pBuf[m_dwByteIdx] : 0; } void CJBig2_BitStream::incByteIdx() { - if (IsInBound()) + if (IsInBounds()) ++m_dwByteIdx; } uint8_t CJBig2_BitStream::getCurByte_arith() const { - return IsInBound() ? m_pBuf[m_dwByteIdx] : 0xFF; + return IsInBounds() ? m_pBuf[m_dwByteIdx] : 0xFF; } uint8_t CJBig2_BitStream::getNextByte_arith() const { @@ -182,7 +182,7 @@ void CJBig2_BitStream::AdvanceBit() { } } -bool CJBig2_BitStream::IsInBound() const { +bool CJBig2_BitStream::IsInBounds() const { return m_dwByteIdx < m_dwLength; } |