| OLD | NEW | 
|---|
| 1 // Copyright 2014 PDFium Authors. All rights reserved. | 1 // Copyright 2014 PDFium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 
| 6 | 6 | 
| 7 #ifndef CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 7 #ifndef CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 
| 8 #define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 8 #define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 
| 9 | 9 | 
| 10 #include "core/fxcrt/include/fx_basic.h" | 10 #include "core/fxcrt/include/fx_basic.h" | 
| 11 | 11 | 
| 12 class CPDF_StreamAcc; | 12 class CPDF_StreamAcc; | 
| 13 | 13 | 
| 14 class CJBig2_BitStream { | 14 class CJBig2_BitStream { | 
| 15  public: | 15  public: | 
| 16   explicit CJBig2_BitStream(CPDF_StreamAcc* pSrcStream); | 16   explicit CJBig2_BitStream(CPDF_StreamAcc* pSrcStream); | 
| 17   ~CJBig2_BitStream(); | 17   ~CJBig2_BitStream(); | 
| 18 | 18 | 
| 19   // TODO(thestig): readFoo() should return bool. | 19   // TODO(thestig): readFoo() should return bool. | 
| 20   int32_t readNBits(FX_DWORD nBits, FX_DWORD* dwResult); | 20   int32_t readNBits(uint32_t nBits, uint32_t* dwResult); | 
| 21   int32_t readNBits(FX_DWORD nBits, int32_t* nResult); | 21   int32_t readNBits(uint32_t nBits, int32_t* nResult); | 
| 22   int32_t read1Bit(FX_DWORD* dwResult); | 22   int32_t read1Bit(uint32_t* dwResult); | 
| 23   int32_t read1Bit(FX_BOOL* bResult); | 23   int32_t read1Bit(FX_BOOL* bResult); | 
| 24   int32_t read1Byte(uint8_t* cResult); | 24   int32_t read1Byte(uint8_t* cResult); | 
| 25   int32_t readInteger(FX_DWORD* dwResult); | 25   int32_t readInteger(uint32_t* dwResult); | 
| 26   int32_t readShortInteger(uint16_t* wResult); | 26   int32_t readShortInteger(uint16_t* wResult); | 
| 27   void alignByte(); | 27   void alignByte(); | 
| 28   uint8_t getCurByte() const; | 28   uint8_t getCurByte() const; | 
| 29   void incByteIdx(); | 29   void incByteIdx(); | 
| 30   uint8_t getCurByte_arith() const; | 30   uint8_t getCurByte_arith() const; | 
| 31   uint8_t getNextByte_arith() const; | 31   uint8_t getNextByte_arith() const; | 
| 32   FX_DWORD getOffset() const; | 32   uint32_t getOffset() const; | 
| 33   void setOffset(FX_DWORD dwOffset); | 33   void setOffset(uint32_t dwOffset); | 
| 34   FX_DWORD getBitPos() const; | 34   uint32_t getBitPos() const; | 
| 35   void setBitPos(FX_DWORD dwBitPos); | 35   void setBitPos(uint32_t dwBitPos); | 
| 36   const uint8_t* getBuf() const; | 36   const uint8_t* getBuf() const; | 
| 37   FX_DWORD getLength() const { return m_dwLength; } | 37   uint32_t getLength() const { return m_dwLength; } | 
| 38   const uint8_t* getPointer() const; | 38   const uint8_t* getPointer() const; | 
| 39   void offset(FX_DWORD dwOffset); | 39   void offset(uint32_t dwOffset); | 
| 40   FX_DWORD getByteLeft() const; | 40   uint32_t getByteLeft() const; | 
| 41   FX_DWORD getObjNum() const; | 41   uint32_t getObjNum() const; | 
| 42 | 42 | 
| 43  private: | 43  private: | 
| 44   void AdvanceBit(); | 44   void AdvanceBit(); | 
| 45   bool IsInBound() const; | 45   bool IsInBound() const; | 
| 46   FX_DWORD LengthInBits() const; | 46   uint32_t LengthInBits() const; | 
| 47 | 47 | 
| 48   const uint8_t* m_pBuf; | 48   const uint8_t* m_pBuf; | 
| 49   FX_DWORD m_dwLength; | 49   uint32_t m_dwLength; | 
| 50   FX_DWORD m_dwByteIdx; | 50   uint32_t m_dwByteIdx; | 
| 51   FX_DWORD m_dwBitIdx; | 51   uint32_t m_dwBitIdx; | 
| 52   const FX_DWORD m_dwObjNum; | 52   const uint32_t m_dwObjNum; | 
| 53 | 53 | 
| 54   CJBig2_BitStream(const CJBig2_BitStream&) = delete; | 54   CJBig2_BitStream(const CJBig2_BitStream&) = delete; | 
| 55   void operator=(const CJBig2_BitStream&) = delete; | 55   void operator=(const CJBig2_BitStream&) = delete; | 
| 56 }; | 56 }; | 
| 57 | 57 | 
| 58 #endif  // CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 58 #endif  // CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ | 
| OLD | NEW | 
|---|