diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-25 13:30:33 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-25 21:09:16 +0000 |
| commit | 87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1 (patch) | |
| tree | 362411e98aaba708c4c6b6a635fbcaee2122426c /core/fxcodec/codec/ccodec_bmpmodule.h | |
| parent | 80547a165adf250f31ade57544771201bbc2690c (diff) | |
| download | pdfium-87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_bmpmodule.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_bmpmodule.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.h b/core/fxcodec/codec/ccodec_bmpmodule.h index d07d9850c6..bdf6544251 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.h +++ b/core/fxcodec/codec/ccodec_bmpmodule.h @@ -7,21 +7,28 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_BMPMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_BMPMODULE_H_ -#include "core/fxcodec/codec/icodec_bmpmodule.h" #include "core/fxcrt/fx_system.h" -class CCodec_BmpModule : public ICodec_BmpModule { +class CFX_DIBAttribute; +struct FXBMP_Context; + +class CCodec_BmpModule { public: + class Delegate { + public: + virtual bool BmpInputImagePositionBuf(uint32_t rcd_pos) = 0; + virtual void BmpReadScanline(int32_t row_num, uint8_t* row_buf) = 0; + }; + CCodec_BmpModule(); - ~CCodec_BmpModule() override; + ~CCodec_BmpModule(); - FXBMP_Context* Start() override; - void Finish(FXBMP_Context* pContext) override; - uint32_t GetAvailInput(FXBMP_Context* pContext, - uint8_t** avail_buf_ptr) override; + FXBMP_Context* Start(); + void Finish(FXBMP_Context* pContext); + uint32_t GetAvailInput(FXBMP_Context* pContext, uint8_t** avail_buf_ptr); void Input(FXBMP_Context* pContext, const uint8_t* src_buf, - uint32_t src_size) override; + uint32_t src_size); int32_t ReadHeader(FXBMP_Context* pContext, int32_t* width, int32_t* height, @@ -29,10 +36,13 @@ class CCodec_BmpModule : public ICodec_BmpModule { int32_t* components, int32_t* pal_num, uint32_t** pal_pp, - CFX_DIBAttribute* pAttribute) override; - int32_t LoadImage(FXBMP_Context* pContext) override; + CFX_DIBAttribute* pAttribute); + int32_t LoadImage(FXBMP_Context* pContext); + Delegate* GetDelegate() const { return m_pDelegate; } + void SetDelegate(Delegate* pDelegate) { m_pDelegate = pDelegate; } protected: + Delegate* m_pDelegate; char m_szLastError[256]; }; |