Merge to XFA: Cleanup dead code in CPDF_DIBSource::LoadJpxBitmap() and friends.

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 "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../fxcrt/fx_basic.h"
 #include "../fxcrt/fx_coordinates.h"
 #include "fx_codec_def.h"
 #include "fx_codec_provider.h"
 
 class CFX_DIBSource;
+class CJPX_Decoder;
 class ICodec_ScanlineDecoder;
 class ICodec_ProgressiveDecoder;
 class ICodec_BasicModule;
 class ICodec_FaxModule;
 class ICodec_JpegModule;
 class ICodec_JpxModule;
 class ICodec_Jbig2Module;
 class ICodec_IccModule;
 class ICodec_FlateModule;
 class ICodec_Jbig2Encoder;
@@ skipping 179 matching lines @@
                          int* nComps,
                          CFX_DIBAttribute* pAttribute = NULL) = 0;
 
   virtual int StartScanline(void* pContext, int down_scale) = 0;
 
   virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) = 0;
 
   virtual FX_DWORD GetAvailInput(void* pContext,
                                  uint8_t** avail_buf_ptr = NULL) = 0;
 };
+
 class ICodec_JpxModule {
  public:
   virtual ~ICodec_JpxModule() {}
 
-  virtual void* CreateDecoder(const uint8_t* src_buf,
-                              FX_DWORD src_size,
-                              FX_BOOL useColorSpace = FALSE) = 0;
+  virtual CJPX_Decoder* CreateDecoder(const uint8_t* src_buf,
+                                      FX_DWORD src_size,
+                                      bool use_colorspace) = 0;
 
-  virtual void GetImageInfo(void* ctx,
-                            FX_DWORD& width,
-                            FX_DWORD& height,
-                            FX_DWORD& codestream_nComps,
-                            FX_DWORD& output_nComps) = 0;
+  virtual void GetImageInfo(CJPX_Decoder* pDecoder,
+                            FX_DWORD* width,
+                            FX_DWORD* height,
+                            FX_DWORD* components) = 0;
 
-  virtual FX_BOOL Decode(void* ctx,
+  virtual FX_BOOL Decode(CJPX_Decoder* pDecoder,
                          uint8_t* dest_data,
                          int pitch,
-                         FX_BOOL bTranslateColor,
                          uint8_t* offsets) = 0;
 
-  virtual void DestroyDecoder(void* ctx) = 0;
+  virtual void DestroyDecoder(CJPX_Decoder* pDecoder) = 0;
 };
 class ICodec_PngModule {
  public:
   virtual ~ICodec_PngModule() {}
 
   virtual void* Start(void* pModule) = 0;
 
   virtual void Finish(void* pContext) = 0;
 
   virtual FX_BOOL Input(void* pContext,
@@ skipping 96 matching lines @@
                                 FX_DWORD& width,
                                 FX_DWORD& height,
                                 FX_DWORD& comps,
                                 FX_DWORD& bpc,
                                 CFX_DIBAttribute* pAttribute = NULL) = 0;
 
   virtual FX_BOOL Decode(void* ctx, class CFX_DIBitmap* pDIBitmap) = 0;
 
   virtual void DestroyDecoder(void* ctx) = 0;
 };
+

[Lei Zhang, 2015/09/03 21:38:40]

There was a conflict due to this blank line.

 class ICodec_Jbig2Module {
  public:
   virtual ~ICodec_Jbig2Module() {}
 
   virtual FX_BOOL Decode(FX_DWORD width,
                          FX_DWORD height,
                          const uint8_t* src_buf,
                          FX_DWORD src_size,
                          const uint8_t* global_data,
                          FX_DWORD global_size,
@@ skipping 181 matching lines @@
   int32_t m_nBmpCompressType;
   class IFX_DIBAttributeExif* m_pExif;
 };
 class IFX_DIBAttributeExif {
  public:
   virtual ~IFX_DIBAttributeExif(){};
   virtual FX_BOOL GetInfo(FX_WORD tag, void* val) = 0;
 };
 
 #endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_H_