From 536486822a5550de975293f7586598be5f29aaad Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 10 Sep 2015 16:40:49 -0700 Subject: Merge to XFA: Remove CJBig2_Object, CJBig2_Module, and friends. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1326953006 . (cherry picked from commit 70f4404e9a9e69afdfdd07715aa946f6561ce0cb) Review URL: https://codereview.chromium.org/1336783002 . --- core/src/fxcodec/codec/codec_int.h | 28 ---------------------------- 1 file changed, 28 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 ee7fe3ba6f..a37f7bd7b8 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -347,33 +347,6 @@ class CCodec_TiffModule : public ICodec_TiffModule { ~CCodec_TiffModule() override {} }; -class CPDF_Jbig2Interface : public CJBig2_Module { - public: - virtual void* JBig2_Malloc(FX_DWORD dwSize) { - return FX_Alloc(uint8_t, dwSize); - } - virtual void* JBig2_Malloc2(FX_DWORD num, FX_DWORD dwSize) { - if (dwSize && num >= UINT_MAX / dwSize) { - return NULL; - } - return FX_Alloc(uint8_t, num * dwSize); - } - virtual void* JBig2_Malloc3(FX_DWORD num, FX_DWORD dwSize, FX_DWORD dwSize2) { - if (dwSize2 && dwSize >= UINT_MAX / dwSize2) { - return NULL; - } - FX_DWORD size = dwSize2 * dwSize; - if (size && num >= UINT_MAX / size) { - return NULL; - } - return FX_Alloc(uint8_t, num * size); - } - virtual void* JBig2_Realloc(void* pMem, FX_DWORD dwSize) { - return FX_Realloc(uint8_t, pMem, dwSize); - } - virtual void JBig2_Free(void* pMem) { FX_Free(pMem); } -}; - class CCodec_Jbig2Context { public: CCodec_Jbig2Context(); @@ -414,7 +387,6 @@ class CCodec_Jbig2Module : public ICodec_Jbig2Module { void DestroyJbig2Context(void* pJbig2Context) override; private: - CPDF_Jbig2Interface m_Module; std::list m_SymbolDictCache; }; class CFX_DIBAttributeExif : public IFX_DIBAttributeExif { -- cgit v1.2.3