From ba9d4655ca39c3a4620acb8e6252defb87a758ad Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 30 Oct 2015 15:51:13 -0700 Subject: Merge to XFA: Remove external jpeg provider interface. (cherry picked from commit 3d59bd9d66d01eb39c30742bce67fa0376cb4ea8) Review URL: https://codereview.chromium.org/1407903005 . Conflicts: core/include/fxcodec/fx_codec_provider.h core/src/fxcodec/codec/codec_int.h core/src/fxcodec/codec/fx_codec_jpeg.cpp R=thestig@chromium.org Review URL: https://codereview.chromium.org/1412713009 . --- core/src/fxcodec/codec/codec_int.h | 6 +----- 1 file changed, 1 insertion(+), 5 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 fbf44c0564..93384caac9 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -158,8 +158,7 @@ class CCodec_FlateModule : public ICodec_FlateModule { class CCodec_JpegModule : public ICodec_JpegModule { public: - CCodec_JpegModule() : m_pExtProvider(NULL) {} - void SetPovider(IFX_JpegProvider* pJP) override { m_pExtProvider = pJP; } + CCodec_JpegModule() {} ICodec_ScanlineDecoder* CreateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, @@ -194,9 +193,6 @@ class CCodec_JpegModule : public ICodec_JpegModule { int StartScanline(void* pContext, int down_scale) override; FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf) override; FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr) override; - - protected: - IFX_JpegProvider* m_pExtProvider; }; #define PNG_ERROR_SIZE 256 class CCodec_PngModule : public ICodec_PngModule { -- cgit v1.2.3