Various changes to JBig2 cache:

core/include/fxcodec/fx_codec.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 CORE_INCLUDE_FXCODEC_FX_CODEC_H_
 #define CORE_INCLUDE_FXCODEC_FX_CODEC_H_
 
 #include <vector>
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
+#include "../fpdfapi/fpdf_objects.h"

[Lei Zhang, 2015/10/08 03:22:44]

nit: forward declare CFX_PrivateData and CPDF_StreamAcc instead?

[David Lattimore, 2015/10/08 03:44:39]

Done.

 #include "../fxcrt/fx_basic.h"
 #include "fx_codec_def.h"
 #include "fx_codec_provider.h"
 
 class CFX_DIBSource;
 class CJPX_Decoder;
 class ICodec_ScanlineDecoder;
 class ICodec_BasicModule;
 class ICodec_FaxModule;
 class ICodec_JpegModule;
@@ skipping 200 matching lines @@
   virtual void DestroyDecoder(CJPX_Decoder* pDecoder) = 0;
 };
 
 class ICodec_Jbig2Module {
  public:
   virtual ~ICodec_Jbig2Module() {}
 
   virtual void* CreateJbig2Context() = 0;
 
   virtual FXCODEC_STATUS StartDecode(void* pJbig2Context,
+                                     CFX_PrivateData* pPrivateData,
                                      FX_DWORD width,
                                      FX_DWORD height,
-                                     const uint8_t* src_buf,
-                                     FX_DWORD src_size,
-                                     const uint8_t* global_data,
-                                     FX_DWORD global_size,
+                                     CPDF_StreamAcc* src_stream,
+                                     CPDF_StreamAcc* global_stream,
                                      uint8_t* dest_buf,
                                      FX_DWORD dest_pitch,
                                      IFX_Pause* pPause) = 0;
 
   virtual FXCODEC_STATUS ContinueDecode(void* pJbig2Content,
                                         IFX_Pause* pPause) = 0;
   virtual void DestroyJbig2Context(void* pJbig2Content) = 0;
 };
 class ICodec_Jbig2Encoder {
  public:
@@ skipping 88 matching lines @@
 
 void FaxG4Decode(const uint8_t* src_buf,
                  FX_DWORD src_size,
                  int* pbitpos,
                  uint8_t* dest_buf,
                  int width,
                  int height,
                  int pitch);
 
 #endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_H_