Merge to XFA: Kill CFX_Object.

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 _FX_CODEC_H_
 #define _FX_CODEC_H_
 #ifndef _FXCRT_EXTENSION_
 #include "../fxcrt/fx_ext.h"
@@ skipping 10 matching lines @@
 class ICodec_Jbig2Module;
 class ICodec_IccModule;
 class ICodec_FlateModule;
 class ICodec_Jbig2Encoder;
 class ICodec_PngModule;
 class ICodec_GifModule;
 class ICodec_BmpModule;
 class ICodec_TiffModule;
 class CFX_DIBAttribute;
 class ICodec_ScanlineDecoder;
-class CCodec_ModuleMgr : public CFX_Object
+class CCodec_ModuleMgr 
 {
 public:
 
     static CCodec_ModuleMgr*    Create();
 
     void                                Destroy();
 
     void                                InitJbig2Decoder();
 
     void                                InitJpxDecoder();
@@ skipping 60 matching lines @@
     ICodec_JpxModule*   m_pJpxModule;
     ICodec_Jbig2Module* m_pJbig2Module;
     ICodec_IccModule*   m_pIccModule;
     ICodec_FlateModule* m_pFlateModule;
     ICodec_PngModule*   m_pPngModule;
     ICodec_GifModule*   m_pGifModule;
     ICodec_BmpModule*   m_pBmpModule;
     ICodec_TiffModule*  m_pTiffModule;
 
 };
-class ICodec_BasicModule : public CFX_Object
+class ICodec_BasicModule 
 {
 public:
 
     virtual ~ICodec_BasicModule() {}
     virtual FX_BOOL     RunLengthEncode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
                                     FX_DWORD& dest_size) = 0;
     virtual FX_BOOL     A85Encode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
                               FX_DWORD& dest_size) = 0;
     virtual ICodec_ScanlineDecoder*     CreateRunLengthDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
             int nComps, int bpc) = 0;
 };
-class ICodec_ScanlineDecoder : public CFX_Object
+class ICodec_ScanlineDecoder 
 {
 public:
 
     virtual ~ICodec_ScanlineDecoder() {}
 
     virtual FX_DWORD    GetSrcOffset() = 0;
 
     virtual void                DownScale(int dest_width, int dest_height) = 0;
 
     virtual FX_LPBYTE   GetScanline(int line) = 0;
 
     virtual FX_BOOL             SkipToScanline(int line, IFX_Pause* pPause) = 0;
 
     virtual int                 GetWidth() = 0;
 
     virtual int                 GetHeight() = 0;
 
     virtual int                 CountComps() = 0;
 
     virtual int                 GetBPC() = 0;
 
     virtual FX_BOOL             IsColorTransformed() = 0;
 
     virtual void                ClearImageData() = 0;
 };
-class ICodec_FlateModule : public CFX_Object
+class ICodec_FlateModule 
 {
 public:
 
     virtual ~ICodec_FlateModule() {}
     virtual ICodec_ScanlineDecoder*     CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
             int nComps, int bpc, int predictor, int Colors, int BitsPerComponent, int Columns) = 0;
     virtual FX_DWORD    FlateOrLZWDecode(FX_BOOL bLZW, const FX_BYTE* src_buf, FX_DWORD src_size, FX_BOOL bEarlyChange,
                                          int predictor, int Colors, int BitsPerComponent, int Columns,
                                          FX_DWORD estimated_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
     virtual FX_BOOL             Encode(const FX_BYTE* src_buf, FX_DWORD src_size,
                                int predictor, int Colors, int BitsPerComponent, int Columns,
                                FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
     virtual FX_BOOL             Encode(FX_LPCBYTE src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
 };
-class ICodec_FaxModule : public CFX_Object
+class ICodec_FaxModule 
 {
 public:
 
     virtual ~ICodec_FaxModule() {}
 
     virtual ICodec_ScanlineDecoder*     CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, int width, int height,
             int K, FX_BOOL EndOfLine, FX_BOOL EncodedByteAlign, FX_BOOL BlackIs1, int Columns, int Rows) = 0;
 
 
     virtual FX_BOOL             Encode(FX_LPCBYTE src_buf, int width, int height, int pitch,
                                FX_LPBYTE& dest_buf, FX_DWORD& dest_size) = 0;
 };
-class ICodec_JpegModule : public CFX_Object
+class ICodec_JpegModule 
 {
 public:
 
     virtual ~ICodec_JpegModule() {}
 
     virtual void                SetPovider(IFX_JpegProvider* pJP) = 0;
 
     virtual ICodec_ScanlineDecoder*     CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size,
             int width, int height, int nComps, FX_BOOL ColorTransform) = 0;
 
@@ skipping 14 matching lines @@
 
 
     virtual int                 StartScanline(void* pContext, int down_scale) = 0;
 
 
     virtual FX_BOOL             ReadScanline(void* pContext, FX_LPBYTE dest_buf) = 0;
 
 
     virtual FX_DWORD    GetAvailInput(void* pContext, FX_LPBYTE* avail_buf_ptr = NULL) = 0;
 };
-class ICodec_JpxModule : public CFX_Object
+class ICodec_JpxModule 
 {
 public:
 
     virtual ~ICodec_JpxModule() {}
 
     virtual FX_LPVOID   CreateDecoder(FX_LPCBYTE src_buf, FX_DWORD src_size, FX_BOOL useColorSpace = FALSE) = 0;
 
     virtual void                GetImageInfo(FX_LPVOID ctx, FX_DWORD& width, FX_DWORD& height,
                                      FX_DWORD& codestream_nComps, FX_DWORD& output_nComps) = 0;
 
     virtual FX_BOOL             Decode(FX_LPVOID ctx, FX_LPBYTE dest_data, int pitch,
                                FX_BOOL bTranslateColor, FX_LPBYTE offsets) = 0;
 
     virtual void                DestroyDecoder(FX_LPVOID ctx) = 0;
 };
-class ICodec_PngModule : public CFX_Object
+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, FX_LPCBYTE src_buf, FX_DWORD src_size, CFX_DIBAttribute* pAttribute = NULL) = 0;
 
     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, FX_LPBYTE& src_buf);
 
     void                                (*FillScanlineBufCompletedCallback)(void* pModule, int pass, int line);
 };
-class ICodec_GifModule : public CFX_Object
+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, FX_LPBYTE* avail_buf_ptr = NULL) = 0;
@@ skipping 11 matching lines @@
 
     virtual FX_INT32    LoadFrame(void* pContext, int frame_num, CFX_DIBAttribute* pAttribute = NULL) = 0;
 
     FX_BOOL                             (*InputRecordPositionBufCallback)(void* pModule, FX_DWORD rcd_pos, const FX_RECT& img_rc,
             FX_INT32 pal_num, void* pal_ptr,
             FX_INT32 delay_time, FX_BOOL user_input,
             FX_INT32 trans_index, FX_INT32 disposal_method, FX_BOOL interlace);
 
     void                                (*ReadScanlineCallback)(void* pModule, FX_INT32 row_num, FX_LPBYTE row_buf);
 };
-class ICodec_BmpModule : public CFX_Object
+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, FX_LPBYTE* avail_buf_ptr = NULL) = 0;
 
     virtual void                Input(void* pContext, FX_LPCBYTE src_buf, FX_DWORD src_size) = 0;
 
     virtual FX_INT32    ReadHeader(void* pContext, FX_INT32* width, FX_INT32* height, FX_BOOL* tb_flag, FX_INT32* components,
                                    int* pal_num, FX_DWORD** pal_pp, CFX_DIBAttribute* pAttribute = NULL) = 0;
 
     virtual FX_INT32    LoadImage(void* pContext) = 0;
 
     FX_BOOL                             (*InputImagePositionBufCallback)(void* pModule, FX_DWORD rcd_pos);
 
     void                                (*ReadScanlineCallback)(void* pModule, FX_INT32 row_num, FX_LPBYTE row_buf);
 };
-class ICodec_TiffModule : public CFX_Object
+class ICodec_TiffModule
 {
 public:
 
     virtual ~ICodec_TiffModule() {}
 
     virtual FX_LPVOID   CreateDecoder(IFX_FileRead* file_ptr) = 0;
 
 
     virtual void                GetFrames(FX_LPVOID ctx, FX_INT32& frames) = 0;
 
     virtual FX_BOOL             LoadFrameInfo(FX_LPVOID ctx, FX_INT32 frame, FX_DWORD& width, FX_DWORD& height, FX_DWORD& comps, FX_DWORD& bpc, CFX_DIBAttribute* pAttribute = NULL) = 0;
 
 
     virtual FX_BOOL             Decode(FX_LPVOID ctx, class CFX_DIBitmap* pDIBitmap) = 0;
 
     virtual void                DestroyDecoder(FX_LPVOID ctx) = 0;
 };
-class ICodec_Jbig2Module : public CFX_Object
+class ICodec_Jbig2Module 
 {
 public:
 
     virtual ~ICodec_Jbig2Module() {}
 
     virtual FX_BOOL             Decode(FX_DWORD width, FX_DWORD height, FX_LPCBYTE src_buf, FX_DWORD src_size,
                                FX_LPCBYTE global_data, FX_DWORD global_size, FX_LPBYTE dest_buf, FX_DWORD dest_pitch)  = 0;
 
     virtual FX_BOOL             Decode(IFX_FileRead* file_ptr, FX_DWORD& width, FX_DWORD& height,
                                FX_DWORD& pitch, FX_LPBYTE& dest_buf) = 0;
     virtual void*                               CreateJbig2Context() = 0;
 
     virtual FXCODEC_STATUS              StartDecode(void* pJbig2Context, FX_DWORD width, FX_DWORD height, FX_LPCBYTE src_buf, FX_DWORD src_size,
                                             FX_LPCBYTE global_data, FX_DWORD global_size, FX_LPBYTE dest_buf, FX_DWORD dest_pitch, IFX_Pause* pPause) = 0;
 
     virtual FXCODEC_STATUS              StartDecode(void* pJbig2Context, IFX_FileRead* file_ptr,
                                             FX_DWORD& width, FX_DWORD& height, FX_DWORD& pitch, FX_LPBYTE& dest_buf, IFX_Pause* pPause) = 0;
     virtual FXCODEC_STATUS              ContinueDecode(void* pJbig2Content, IFX_Pause* pPause) = 0;
     virtual void                                DestroyJbig2Context(void* pJbig2Content) = 0;
 };
-class ICodec_ProgressiveDecoder : public CFX_Object
+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_IMAGE_TYPE  GetType() = 0;
 
     virtual FX_INT32                    GetWidth() = 0;
 
     virtual FX_INT32                    GetHeight() = 0;
 
     virtual FX_INT32                    GetNumComponents() = 0;
 
     virtual FX_INT32                    GetBPC() = 0;
 
     virtual void                                SetClipBox(FX_RECT* clip) = 0;
 
     virtual FXCODEC_STATUS              GetFrames(FX_INT32& frames, IFX_Pause* pPause = NULL) = 0;
 
     virtual FXCODEC_STATUS              StartDecode(class CFX_DIBitmap* pDIBitmap,
                                             FX_INT32 start_x, FX_INT32 start_y, FX_INT32 size_x, FX_INT32 size_y,
                                             FX_INT32 frames = 0, FX_BOOL bInterpol = TRUE) = 0;
 
     virtual FXCODEC_STATUS              ContinueDecode(IFX_Pause* pPause = NULL) = 0;
 };
-class ICodec_Jbig2Encoder : public CFX_Object
+class ICodec_Jbig2Encoder 
 {
 public:
 
     virtual ~ICodec_Jbig2Encoder() {}
 };
-class ICodec_IccModule : public CFX_Object
+class ICodec_IccModule 
 {
 public:
     typedef enum {
         IccCS_Unknown = 0,
         IccCS_XYZ,
         IccCS_Lab,
         IccCS_Luv,
         IccCS_YCbCr,
         IccCS_Yxy,
         IccCS_Hsv,
@@ skipping 41 matching lines @@
     virtual void                        DestroyTransform(FX_LPVOID pTransform) = 0;
 
     virtual void                        Translate(FX_LPVOID pTransform, FX_FLOAT* pSrcValues, FX_FLOAT* pDestValues) = 0;
 
     virtual void                        TranslateScanline(FX_LPVOID pTransform, FX_LPBYTE pDest, FX_LPCBYTE pSrc, int pixels) = 0;
     virtual void                        SetComponents(FX_DWORD nComponents) = 0;
 };
 void AdobeCMYK_to_sRGB(FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B);
 void AdobeCMYK_to_sRGB1(FX_BYTE c, FX_BYTE m, FX_BYTE y, FX_BYTE k, FX_BYTE& R, FX_BYTE& G, FX_BYTE& B);
 FX_BOOL MD5ComputeID(FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16]);
-class CFX_DIBAttribute : public CFX_Object
+class CFX_DIBAttribute
 {
 public:
     CFX_DIBAttribute();
     ~CFX_DIBAttribute();
 
     FX_INT32            m_nXDPI;
 
     FX_INT32            m_nYDPI;
 
     FX_FLOAT            m_fAspectRatio;
 
     FX_WORD                     m_wDPIUnit;
 
     CFX_ByteString      m_strAuthor;
 
     FX_BYTE                     m_strTime[20];
 
     FX_INT32            m_nGifLeft;
     FX_INT32            m_nGifTop;
 
     FX_DWORD*           m_pGifLocalPalette;
 
     FX_DWORD            m_nGifLocalPalNum;
 
     FX_INT32            m_nBmpCompressType;
     class IFX_DIBAttributeExif* m_pExif;
 };
-class IFX_DIBAttributeExif : public CFX_Object
+class IFX_DIBAttributeExif
 {
 public:
     virtual ~IFX_DIBAttributeExif() {};
     virtual FX_BOOL             GetInfo(FX_WORD tag, FX_LPVOID val) = 0;
 };
 #endif