From 87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 25 Apr 2017 13:30:33 -0700 Subject: Remove remaining ICodec_* abstract classes They are only implemented in one way, and the layering does not required an interface here. Change-Id: Id87591ca237fb66dbfc5aa62b4cc11c2464f5ffa Reviewed-on: https://pdfium-review.googlesource.com/4496 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fxcodec/codec/ccodec_pngmodule.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'core/fxcodec/codec/ccodec_pngmodule.h') diff --git a/core/fxcodec/codec/ccodec_pngmodule.h b/core/fxcodec/codec/ccodec_pngmodule.h index 0ca33f03c6..f0a08db66c 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.h +++ b/core/fxcodec/codec/ccodec_pngmodule.h @@ -7,24 +7,42 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_ -#include "core/fxcodec/codec/icodec_pngmodule.h" #include "core/fxcrt/fx_system.h" +class CFX_DIBAttribute; +struct FXPNG_Context; + #define PNG_ERROR_SIZE 256 -class CCodec_PngModule : public ICodec_PngModule { +class CCodec_PngModule { public: + class Delegate { + public: + virtual bool PngReadHeader(int width, + int height, + int bpc, + int pass, + int* color_type, + double* gamma) = 0; + virtual bool PngAskScanlineBuf(int line, uint8_t*& src_buf) = 0; + virtual void PngFillScanlineBufCompleted(int pass, int line) = 0; + }; + CCodec_PngModule(); - ~CCodec_PngModule() override; + ~CCodec_PngModule(); - FXPNG_Context* Start() override; - void Finish(FXPNG_Context* pContext) override; + FXPNG_Context* Start(); + void Finish(FXPNG_Context* pContext); bool Input(FXPNG_Context* pContext, const uint8_t* src_buf, uint32_t src_size, - CFX_DIBAttribute* pAttribute) override; + CFX_DIBAttribute* pAttribute); + + Delegate* GetDelegate() const { return m_pDelegate; } + void SetDelegate(Delegate* delegate) { m_pDelegate = delegate; } protected: + Delegate* m_pDelegate; char m_szLastError[PNG_ERROR_SIZE]; }; -- cgit v1.2.3