XFA: Remove null CFX_DIBAttribute default argument

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 <map>
 #include <vector>
 
 #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"
 
+#include "../fxcrt/fx_coordinates.h"  // For FX_RECT.

[Tom Sepez, 2015/10/29 21:54:03]

note: moved because XFA only.  Will look nice when the automatic ifdefs get
added.  Henceforth, other spots where this occurs are marked with ***

[Lei Zhang, 2015/10/30 06:06:31]

Acknowledged.

+
 class CFX_DIBSource;
 class CJPX_Decoder;
 class CPDF_PrivateData;
 class CPDF_StreamAcc;
 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;
+class ICodec_ScanlineDecoder;
+
+class ICodec_ProgressiveDecoder;

[Tom Sepez, 2015/10/29 21:54:03]

***

[Lei Zhang, 2015/10/30 06:06:31]

Care to sort this section and the one above?

[Tom Sepez, 2015/10/30 20:10:34]

Done.  And there was a duplicate class that popped out plain as day after
sorting the first one.

 class ICodec_PngModule;
 class ICodec_GifModule;
 class ICodec_BmpModule;
 class ICodec_TiffModule;
-class CFX_DIBAttribute;
-class ICodec_ScanlineDecoder;
+
+class CFX_DIBAttribute {
+ public:
+  CFX_DIBAttribute();
+  ~CFX_DIBAttribute();
+
+  int32_t m_nXDPI;
+  int32_t m_nYDPI;
+  FX_FLOAT m_fAspectRatio;
+  FX_WORD m_wDPIUnit;
+  CFX_ByteString m_strAuthor;
+  uint8_t m_strTime[20];
+  int32_t m_nGifLeft;
+  int32_t m_nGifTop;
+  FX_DWORD* m_pGifLocalPalette;
+  FX_DWORD m_nGifLocalPalNum;
+  int32_t m_nBmpCompressType;
+  std::map<FX_DWORD, void*> m_Exif;
+};
 
 class CCodec_ModuleMgr {
  public:
   CCodec_ModuleMgr();
-  ICodec_ProgressiveDecoder* CreateProgressiveDecoder();
   ICodec_Jbig2Encoder* CreateJbig2Encoder();
   ICodec_BasicModule* GetBasicModule() const { return m_pBasicModule.get(); }
   ICodec_FaxModule* GetFaxModule() const { return m_pFaxModule.get(); }
   ICodec_JpegModule* GetJpegModule() const { return m_pJpegModule.get(); }
   ICodec_JpxModule* GetJpxModule() const { return m_pJpxModule.get(); }
   ICodec_Jbig2Module* GetJbig2Module() const { return m_pJbig2Module.get(); }
   ICodec_IccModule* GetIccModule() const { return m_pIccModule.get(); }
   ICodec_FlateModule* GetFlateModule() const { return m_pFlateModule.get(); }
+
+  ICodec_ProgressiveDecoder* CreateProgressiveDecoder();

[Tom Sepez, 2015/10/29 21:54:03]

***

[Lei Zhang, 2015/10/30 06:06:32]

Acknowledged.

   ICodec_PngModule* GetPngModule() const { return m_pPngModule.get(); }
   ICodec_GifModule* GetGifModule() const { return m_pGifModule.get(); }
   ICodec_BmpModule* GetBmpModule() const { return m_pBmpModule.get(); }
   ICodec_TiffModule* GetTiffModule() const { return m_pTiffModule.get(); }
 
  protected:
   nonstd::unique_ptr<ICodec_BasicModule> m_pBasicModule;
   nonstd::unique_ptr<ICodec_FaxModule> m_pFaxModule;
   nonstd::unique_ptr<ICodec_JpegModule> m_pJpegModule;
   nonstd::unique_ptr<ICodec_JpxModule> m_pJpxModule;
   nonstd::unique_ptr<ICodec_Jbig2Module> m_pJbig2Module;
   nonstd::unique_ptr<ICodec_IccModule> m_pIccModule;
   nonstd::unique_ptr<ICodec_FlateModule> m_pFlateModule;
+
   nonstd::unique_ptr<ICodec_PngModule> m_pPngModule;

[Lei Zhang, 2015/10/30 06:06:32]

*** ?

[Tom Sepez, 2015/10/30 20:10:34]

***

   nonstd::unique_ptr<ICodec_GifModule> m_pGifModule;
   nonstd::unique_ptr<ICodec_BmpModule> m_pBmpModule;
   nonstd::unique_ptr<ICodec_TiffModule> m_pTiffModule;
 };
 class ICodec_BasicModule {
  public:
   virtual ~ICodec_BasicModule() {}
   virtual FX_BOOL RunLengthEncode(const uint8_t* src_buf,
                                   FX_DWORD src_size,
                                   uint8_t*& dest_buf,
@@ skipping 129 matching lines @@
   virtual void Finish(void* pContext) = 0;
 
   virtual void Input(void* pContext,
                      const uint8_t* src_buf,
                      FX_DWORD src_size) = 0;
 
   virtual int ReadHeader(void* pContext,
                          int* width,
                          int* height,
                          int* nComps,
-                         CFX_DIBAttribute* pAttribute = NULL) = 0;
+                         CFX_DIBAttribute* pAttribute) = 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 {
@@ skipping 20 matching lines @@
  public:
   virtual ~ICodec_PngModule() {}
 
   virtual void* Start(void* pModule) = 0;
 
   virtual void Finish(void* pContext) = 0;
 
   virtual FX_BOOL Input(void* pContext,
                         const uint8_t* src_buf,
                         FX_DWORD src_size,
-                        CFX_DIBAttribute* pAttribute = NULL) = 0;
+                        CFX_DIBAttribute* pAttribute) = 0;
 
-  FX_BOOL                               (*ReadHeaderCallback)(void* pModule, int width, int height, int bpc, int pass, int* color_type, double* gamma);
+  FX_BOOL (*ReadHeaderCallback)(void* pModule,
+                                int width,
+                                int height,
+                                int bpc,
+                                int pass,
+                                int* color_type,
+                                double* gamma);
 
   FX_BOOL (*AskScanlineBufCallback)(void* pModule, int line, uint8_t*& src_buf);
 
   void (*FillScanlineBufCompletedCallback)(void* pModule, int pass, int line);
 };
 class ICodec_GifModule {
  public:
   virtual ~ICodec_GifModule() {}
 
   virtual void* Start(void* pModule) = 0;
 
   virtual void Finish(void* pContext) = 0;
 
   virtual FX_DWORD GetAvailInput(void* pContext,
                                  uint8_t** avail_buf_ptr = NULL) = 0;
 
   virtual void Input(void* pContext,
                      const uint8_t* src_buf,
                      FX_DWORD src_size) = 0;
 
   virtual int32_t ReadHeader(void* pContext,
                              int* width,
                              int* height,
                              int* pal_num,
                              void** pal_pp,
                              int* bg_index,
-                             CFX_DIBAttribute* pAttribute = NULL) = 0;
+                             CFX_DIBAttribute* pAttribute) = 0;
 
   virtual int32_t LoadFrameInfo(void* pContext, int* frame_num) = 0;
 
   void (*RecordCurrentPositionCallback)(void* pModule, FX_DWORD& cur_pos);
 
   uint8_t* (*AskLocalPaletteBufCallback)(void* pModule,
                                          int32_t frame_num,
                                          int32_t pal_size);
 
   virtual int32_t LoadFrame(void* pContext,
                             int frame_num,
-                            CFX_DIBAttribute* pAttribute = NULL) = 0;
+                            CFX_DIBAttribute* pAttribute) = 0;
 
-  FX_BOOL                               (*InputRecordPositionBufCallback)(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc,
-            int32_t pal_num, void* pal_ptr,
-            int32_t delay_time, FX_BOOL user_input,
-            int32_t trans_index, int32_t disposal_method, FX_BOOL interlace);
+  FX_BOOL (*InputRecordPositionBufCallback)(void* pModule,
+                                            FX_DWORD rcd_pos,
+                                            const FX_RECT& img_rc,
+                                            int32_t pal_num,
+                                            void* pal_ptr,
+                                            int32_t delay_time,
+                                            FX_BOOL user_input,
+                                            int32_t trans_index,
+                                            int32_t disposal_method,
+                                            FX_BOOL interlace);
 
   void (*ReadScanlineCallback)(void* pModule,
                                int32_t row_num,
                                uint8_t* row_buf);
 };
 class ICodec_BmpModule {
  public:
   virtual ~ICodec_BmpModule() {}
 
   virtual void* Start(void* pModule) = 0;
 
   virtual void Finish(void* pContext) = 0;
 
   virtual FX_DWORD GetAvailInput(void* pContext,
                                  uint8_t** avail_buf_ptr = NULL) = 0;
 
   virtual void Input(void* pContext,
                      const uint8_t* src_buf,
                      FX_DWORD src_size) = 0;
 
   virtual int32_t ReadHeader(void* pContext,
                              int32_t* width,
                              int32_t* height,
                              FX_BOOL* tb_flag,
                              int32_t* components,
                              int* pal_num,
                              FX_DWORD** pal_pp,
-                             CFX_DIBAttribute* pAttribute = NULL) = 0;
+                             CFX_DIBAttribute* pAttribute) = 0;
 
   virtual int32_t LoadImage(void* pContext) = 0;
 
   FX_BOOL (*InputImagePositionBufCallback)(void* pModule, FX_DWORD rcd_pos);
 
   void (*ReadScanlineCallback)(void* pModule,
                                int32_t row_num,
                                uint8_t* row_buf);
 };
 class ICodec_TiffModule {
  public:
   virtual ~ICodec_TiffModule() {}
 
   virtual void* CreateDecoder(IFX_FileRead* file_ptr) = 0;
 
   virtual void GetFrames(void* ctx, int32_t& frames) = 0;
 
   virtual FX_BOOL LoadFrameInfo(void* ctx,
                                 int32_t frame,
                                 FX_DWORD& width,
                                 FX_DWORD& height,
                                 FX_DWORD& comps,
                                 FX_DWORD& bpc,
-                                CFX_DIBAttribute* pAttribute = NULL) = 0;
+                                CFX_DIBAttribute* pAttribute) = 0;
 
   virtual FX_BOOL Decode(void* ctx, class CFX_DIBitmap* pDIBitmap) = 0;
 
   virtual void DestroyDecoder(void* ctx) = 0;
 };
 
 class ICodec_Jbig2Module {
  public:
   virtual ~ICodec_Jbig2Module() {}
 
@@ skipping 10 matching lines @@
                                      IFX_Pause* pPause) = 0;
 
   virtual FXCODEC_STATUS ContinueDecode(void* pJbig2Content,
                                         IFX_Pause* pPause) = 0;
   virtual void DestroyJbig2Context(void* pJbig2Content) = 0;
 };
 class ICodec_ProgressiveDecoder {
  public:
   virtual ~ICodec_ProgressiveDecoder() {}
 
-  virtual FXCODEC_STATUS LoadImageInfo(
-      IFX_FileRead* pFile,
-      FXCODEC_IMAGE_TYPE imageType = FXCODEC_IMAGE_UNKNOWN,
-      CFX_DIBAttribute* pAttribute = NULL) = 0;
+  virtual FXCODEC_STATUS LoadImageInfo(IFX_FileRead* pFile,
+                                       FXCODEC_IMAGE_TYPE imageType,
+                                       CFX_DIBAttribute* pAttribute) = 0;
 
-  virtual FXCODEC_IMAGE_TYPE GetType() = 0;
-
-  virtual int32_t GetWidth() = 0;
-
-  virtual int32_t GetHeight() = 0;
-
-  virtual int32_t GetNumComponents() = 0;
-
-  virtual int32_t GetBPC() = 0;
+  virtual FXCODEC_IMAGE_TYPE GetType() const = 0;
+  virtual int32_t GetWidth() const = 0;
+  virtual int32_t GetHeight() const = 0;
+  virtual int32_t GetNumComponents() const = 0;
+  virtual int32_t GetBPC() const = 0;
 
   virtual void SetClipBox(FX_RECT* clip) = 0;
 
   virtual FXCODEC_STATUS GetFrames(int32_t& frames,
                                    IFX_Pause* pPause = NULL) = 0;
 
   virtual FXCODEC_STATUS StartDecode(class CFX_DIBitmap* pDIBitmap,
                                      int32_t start_x,
                                      int32_t start_y,
                                      int32_t size_x,
@@ skipping 87 matching lines @@
                        FX_FLOAT& G,
                        FX_FLOAT& B);
 void AdobeCMYK_to_sRGB1(uint8_t c,
                         uint8_t m,
                         uint8_t y,
                         uint8_t k,
                         uint8_t& R,
                         uint8_t& G,
                         uint8_t& B);
 FX_BOOL MD5ComputeID(const void* buf, FX_DWORD dwSize, uint8_t ID[16]);
-
-class CFX_DIBAttribute {
- public:
-  CFX_DIBAttribute();
-  ~CFX_DIBAttribute();
-
-  int32_t m_nXDPI;
-  int32_t m_nYDPI;
-  FX_FLOAT m_fAspectRatio;
-  FX_WORD m_wDPIUnit;
-  CFX_ByteString m_strAuthor;
-  uint8_t m_strTime[20];
-  int32_t m_nGifLeft;
-  int32_t m_nGifTop;
-  FX_DWORD* m_pGifLocalPalette;
-  FX_DWORD m_nGifLocalPalNum;
-  int32_t m_nBmpCompressType;
-  std::map<FX_DWORD, void*> m_Exif;
-};
-
 FX_BOOL FaxSkipEOL(const uint8_t* src_buf, int bitsize, int& bitpos);
 FX_BOOL FaxGet1DLine(const uint8_t* src_buf,
                      int bitsize,
                      int& bitpos,
                      uint8_t* dest_buf,
                      int columns);
 FX_BOOL FaxG4GetRow(const uint8_t* src_buf,
                     int bitsize,
                     int& bitpos,
                     uint8_t* dest_buf,
                     const uint8_t* ref_buf,
                     int columns);
 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_