From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/src/fxcodec/codec/codec_int.h | 4 ++-- core/src/fxcodec/codec/fx_codec_fax.cpp | 2 +- core/src/fxcodec/codec/fx_codec_flate.cpp | 2 +- core/src/fxcodec/codec/fx_codec_icc.cpp | 6 +++--- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 +- core/src/fxcodec/codec/fx_codec_progress.h | 6 +++--- core/src/fxcodec/codec/fx_codec_tiff.cpp | 2 +- core/src/fxcodec/lgif/fx_gif.h | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'core/src/fxcodec') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 752eb3f1a5..ae9f22bc4a 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -268,7 +268,7 @@ public: virtual FX_BOOL Decode(FX_LPVOID ctx, class CFX_DIBitmap* pDIBitmap); virtual void DestroyDecoder(FX_LPVOID ctx); }; -class CPDF_Jbig2Interface : public CFX_Object, public CJBig2_Module +class CPDF_Jbig2Interface : public CJBig2_Module { public: virtual void *JBig2_Malloc(FX_DWORD dwSize) @@ -302,7 +302,7 @@ public: FX_Free(pMem); } }; -class CCodec_Jbig2Context : public CFX_Object +class CCodec_Jbig2Context { public: CCodec_Jbig2Context(); diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp index c6c13f98bb..c6ab791a0e 100644 --- a/core/src/fxcodec/codec/fx_codec_fax.cpp +++ b/core/src/fxcodec/codec/fx_codec_fax.cpp @@ -926,7 +926,7 @@ static void _FaxEncode2DLine(FX_LPBYTE dest_buf, int& dest_bitpos, FX_LPCBYTE sr } } } -class CCodec_FaxEncoder : public CFX_Object +class CCodec_FaxEncoder { public: CCodec_FaxEncoder(FX_LPCBYTE src_buf, int width, int height, int pitch); diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index e17c32a2c7..afdb8354e6 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -74,7 +74,7 @@ extern "C" compress(dest_buf, dest_size, src_buf, src_size); } } -class CLZWDecoder : public CFX_Object +class CLZWDecoder { public: FX_BOOL Decode(FX_LPBYTE output, FX_DWORD& outlen, const FX_BYTE* input, FX_DWORD& size, FX_BOOL bEarlyChange); diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 6bdc225adf..1a4fce63f2 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -17,7 +17,7 @@ FX_BOOL MD5ComputeID( FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16] ) { return cmsMD5computeIDExt(buf, dwSize, ID); } -struct CLcmsCmm : public CFX_Object { +struct CLcmsCmm { cmsHTRANSFORM m_hTransform; int m_nSrcComponents; int m_nDstComponents; @@ -342,7 +342,7 @@ FX_DWORD TransferProfileType(FX_LPVOID pProfile, FX_DWORD dwFormat) return 0; } } -class CFX_IccProfileCache : public CFX_Object +class CFX_IccProfileCache { public: CFX_IccProfileCache(); @@ -366,7 +366,7 @@ CFX_IccProfileCache::~CFX_IccProfileCache() void CFX_IccProfileCache::Purge() { } -class CFX_IccTransformCache : public CFX_Object +class CFX_IccTransformCache { public: CFX_IccTransformCache(CLcmsCmm* pCmm = NULL); diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index d98cb03f09..0f0d2e5e41 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -584,7 +584,7 @@ void color_apply_conversion(opj_image_t *image) return; } } -class CJPX_Decoder : public CFX_Object +class CJPX_Decoder { public: CJPX_Decoder(); diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h index 6a618e2f51..ea53c8f010 100644 --- a/core/src/fxcodec/codec/fx_codec_progress.h +++ b/core/src/fxcodec/codec/fx_codec_progress.h @@ -17,7 +17,7 @@ struct PixelWeight { int m_SrcEnd; int m_Weights[1]; }; -class CFXCODEC_WeightTable : public CFX_Object +class CFXCODEC_WeightTable { public: CFXCODEC_WeightTable() @@ -40,7 +40,7 @@ public: int m_DestMin, m_ItemSize; FX_LPBYTE m_pWeightTables; }; -class CFXCODEC_HorzTable : public CFX_Object +class CFXCODEC_HorzTable { public: CFXCODEC_HorzTable() @@ -63,7 +63,7 @@ public: int m_ItemSize; FX_LPBYTE m_pWeightTables; }; -class CFXCODEC_VertTable : public CFX_Object +class CFXCODEC_VertTable { public: CFXCODEC_VertTable() diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp index 51fde42c70..b51444592d 100644 --- a/core/src/fxcodec/codec/fx_codec_tiff.cpp +++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp @@ -13,7 +13,7 @@ extern "C" { void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, unsigned int dwProfileSize, int nComponents, int intent, FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT); void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, int pixels); void IccLib_DestroyTransform(void* pTransform); -class CCodec_TiffContext : public CFX_Object +class CCodec_TiffContext { public: CCodec_TiffContext(); diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h index b499a542b6..3d2b232267 100644 --- a/core/src/fxcodec/lgif/fx_gif.h +++ b/core/src/fxcodec/lgif/fx_gif.h @@ -117,7 +117,7 @@ typedef struct tagGifPlainText { GifPTE* pte_ptr; CFX_ByteString* string_ptr; } GifPlainText; -class CGifLZWDecoder : public CFX_Object +class CGifLZWDecoder { public: struct tag_Table { @@ -158,7 +158,7 @@ private: FX_LPSTR err_msg_ptr; }; -class CGifLZWEncoder : public CFX_Object +class CGifLZWEncoder { public: struct tag_Table { -- cgit v1.2.3