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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/codec/codec_int.h') 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(); -- cgit v1.2.3