diff options
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_BitStream.h')
-rw-r--r-- | core/fxcodec/jbig2/JBig2_BitStream.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h index 45eb44c46a..191438fee7 100644 --- a/core/fxcodec/jbig2/JBig2_BitStream.h +++ b/core/fxcodec/jbig2/JBig2_BitStream.h @@ -17,39 +17,39 @@ class CJBig2_BitStream { ~CJBig2_BitStream(); // TODO(thestig): readFoo() should return bool. - int32_t readNBits(FX_DWORD nBits, FX_DWORD* dwResult); - int32_t readNBits(FX_DWORD nBits, int32_t* nResult); - int32_t read1Bit(FX_DWORD* dwResult); + int32_t readNBits(uint32_t nBits, uint32_t* dwResult); + int32_t readNBits(uint32_t nBits, int32_t* nResult); + int32_t read1Bit(uint32_t* dwResult); int32_t read1Bit(FX_BOOL* bResult); int32_t read1Byte(uint8_t* cResult); - int32_t readInteger(FX_DWORD* dwResult); + int32_t readInteger(uint32_t* dwResult); int32_t readShortInteger(uint16_t* wResult); void alignByte(); uint8_t getCurByte() const; void incByteIdx(); uint8_t getCurByte_arith() const; uint8_t getNextByte_arith() const; - FX_DWORD getOffset() const; - void setOffset(FX_DWORD dwOffset); - FX_DWORD getBitPos() const; - void setBitPos(FX_DWORD dwBitPos); + uint32_t getOffset() const; + void setOffset(uint32_t dwOffset); + uint32_t getBitPos() const; + void setBitPos(uint32_t dwBitPos); const uint8_t* getBuf() const; - FX_DWORD getLength() const { return m_dwLength; } + uint32_t getLength() const { return m_dwLength; } const uint8_t* getPointer() const; - void offset(FX_DWORD dwOffset); - FX_DWORD getByteLeft() const; - FX_DWORD getObjNum() const; + void offset(uint32_t dwOffset); + uint32_t getByteLeft() const; + uint32_t getObjNum() const; private: void AdvanceBit(); bool IsInBound() const; - FX_DWORD LengthInBits() const; + uint32_t LengthInBits() const; const uint8_t* m_pBuf; - FX_DWORD m_dwLength; - FX_DWORD m_dwByteIdx; - FX_DWORD m_dwBitIdx; - const FX_DWORD m_dwObjNum; + uint32_t m_dwLength; + uint32_t m_dwByteIdx; + uint32_t m_dwBitIdx; + const uint32_t m_dwObjNum; CJBig2_BitStream(const CJBig2_BitStream&) = delete; void operator=(const CJBig2_BitStream&) = delete; |