From 958142efa4561b5efd52733ad6c3b889cf49b3ae Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 25 Sep 2018 20:06:50 +0000 Subject: Introduce CodecModuleIface for progressive decoder modules. Another step before trying to fix the memory issue. Forces common APIs on the bunch of decoders, though some methods are unused. Requires adding some arguments/return values to get to a common API which are not used in all cases (yet?). Required converting some args to spans. Required proxying a GetJumpMark() call through the public module API to the private context. Bug: pdfium:1082 Change-Id: I0c0b7415141ff2a6f4f44777ca3d05521f08130d Reviewed-on: https://pdfium-review.googlesource.com/41950 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- core/fxcodec/codec/ccodec_tiffmodule.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'core/fxcodec/codec/ccodec_tiffmodule.h') diff --git a/core/fxcodec/codec/ccodec_tiffmodule.h b/core/fxcodec/codec/ccodec_tiffmodule.h index 8d3bed7df2..15d2a9f6d2 100644 --- a/core/fxcodec/codec/ccodec_tiffmodule.h +++ b/core/fxcodec/codec/ccodec_tiffmodule.h @@ -9,6 +9,7 @@ #include +#include "core/fxcodec/codec/codec_module_iface.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxge/dib/cfx_dibitmap.h" @@ -16,15 +17,17 @@ class CFX_DIBAttribute; class IFX_SeekableReadStream; -class CCodec_TiffModule { +class CCodec_TiffModule final : public CodecModuleIface { public: - class Context { - public: - virtual ~Context() {} - }; - std::unique_ptr CreateDecoder( const RetainPtr& file_ptr); + + // CodecModuleIface: + FX_FILESIZE GetAvailInput(Context* pContext) const override; + bool Input(Context* pContext, + pdfium::span src_buf, + CFX_DIBAttribute* pAttribute) override; + bool LoadFrameInfo(Context* ctx, int32_t frame, int32_t* width, -- cgit v1.2.3