Various changes to JBig2 cache:

core/src/fxcodec/jbig2/JBig2_BitStream.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _JBIG2_BIT_STREAM_H_
 #define _JBIG2_BIT_STREAM_H_
 
+#include "../../../include/fpdfapi/fpdf_objects.h"
 #include "JBig2_Define.h"
 
 class CJBig2_BitStream {
  public:
-  CJBig2_BitStream(const uint8_t* pBuffer, FX_DWORD dwLength);
+  CJBig2_BitStream(CPDF_StreamAcc* pSrcStream);

[Lei Zhang, 2015/10/06 22:40:24]

add the explicit keyword

[David Lattimore, 2015/10/07 22:41:53]

Done.

 
   CJBig2_BitStream(CJBig2_BitStream& bs);
 
   ~CJBig2_BitStream();
 
   int32_t readNBits(FX_DWORD nBits, FX_DWORD* dwResult);
 
   int32_t readNBits(FX_DWORD nBits, int32_t* nResult);
 
   int32_t read1Bit(FX_DWORD* dwResult);
@@ skipping 33 matching lines @@
   const uint8_t* getBuf();
 
   FX_DWORD getLength() { return m_dwLength; }
 
   const uint8_t* getPointer();
 
   void offset(FX_DWORD dwOffset);
 
   FX_DWORD getByteLeft();
 
+  FX_DWORD getObjNum();

[Lei Zhang, 2015/10/06 22:40:24]

This can be a const method.

[David Lattimore, 2015/10/07 22:41:53]

Done.

+
  private:
   const uint8_t* m_pBuf;
 
   FX_DWORD m_dwLength;
 
   FX_DWORD m_dwByteIdx;
 
   FX_DWORD m_dwBitIdx;
+
+  FX_DWORD m_dwObjNum;

[Lei Zhang, 2015/10/06 22:40:24]

If you move the initialization in the ctors to the initializer list, you can
make this const.

[David Lattimore, 2015/10/07 22:41:53]

Done.

 };
-inline CJBig2_BitStream::CJBig2_BitStream(const uint8_t* pBuffer,
-                                          FX_DWORD dwLength) {
-  m_pBuf = pBuffer;
-  m_dwLength = dwLength;
+inline CJBig2_BitStream::CJBig2_BitStream(CPDF_StreamAcc* pSrcStream) {

[Lei Zhang, 2015/10/06 22:40:24]

Oh geez, I need to fix more of these silly inlining later.

+  m_pBuf = pSrcStream->GetData();
+  m_dwLength = pSrcStream->GetSize();
+  m_dwObjNum = pSrcStream->GetStream()->GetObjNum();
   m_dwByteIdx = 0;
   m_dwBitIdx = 0;
   if (m_dwLength > 256 * 1024 * 1024) {
     m_dwLength = 0;
     m_pBuf = NULL;
   }
 }
 inline CJBig2_BitStream::CJBig2_BitStream(CJBig2_BitStream& bs) {
   m_pBuf = bs.m_pBuf;
   m_dwLength = bs.m_dwLength;
   m_dwByteIdx = bs.m_dwByteIdx;
   m_dwBitIdx = bs.m_dwBitIdx;
+  m_dwObjNum = bs.m_dwObjNum;
 }
 inline CJBig2_BitStream::~CJBig2_BitStream() {}
 inline int32_t CJBig2_BitStream::readNBits(FX_DWORD dwBits,
                                            FX_DWORD* dwResult) {
   FX_DWORD dwTemp = (m_dwByteIdx << 3) + m_dwBitIdx;
   if (dwTemp <= (m_dwLength << 3)) {
     *dwResult = 0;
     if (dwTemp + dwBits <= (m_dwLength << 3)) {
       dwTemp = dwBits;
     } else {
@@ skipping 177 matching lines @@
 }
 inline const uint8_t* CJBig2_BitStream::getPointer() {
   return m_pBuf + m_dwByteIdx;
 }
 inline void CJBig2_BitStream::offset(FX_DWORD dwOffset) {
   m_dwByteIdx += dwOffset;
 }
 inline FX_DWORD CJBig2_BitStream::getByteLeft() {
   return m_dwLength - m_dwByteIdx;
 }
+inline FX_DWORD CJBig2_BitStream::getObjNum() {
+  return m_dwObjNum;
+}
 #endif