diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-03-01 12:15:00 -0800 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-01 20:43:46 +0000 |
commit | b4a261855b34b4c8d938118762ae609a34a3ae99 (patch) | |
tree | 7b084e874cbf41eec73a3cec949dc810983cc0cf /core/fxcodec/codec/ccodec_gifmodule.h | |
parent | fed39cf4a23341cf9cb5a5b432248b4247022282 (diff) | |
download | pdfium-b4a261855b34b4c8d938118762ae609a34a3ae99.tar.xz |
Create virtual codec APIs so chrome/fuzzers can link separately
The one step to make an actual concrete class is conditionalized
in fpdfview and is unconditional in the fuzzer.
Also replace the clumsy C-style callbacks with a delegate
interface as long as we are making new interfaces.
Change-Id: I733a437483ce5e0c34211cfbbda05105336f55b5
Reviewed-on: https://pdfium-review.googlesource.com/2887
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_gifmodule.h')
-rw-r--r-- | core/fxcodec/codec/ccodec_gifmodule.h | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h index 21ac92d6c7..7721d7a767 100644 --- a/core/fxcodec/codec/ccodec_gifmodule.h +++ b/core/fxcodec/codec/ccodec_gifmodule.h @@ -7,24 +7,23 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_ +#include "core/fxcodec/codec/icodec_gifmodule.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -class CFX_DIBAttribute; -struct FXGIF_Context; - -class CCodec_GifModule { +class CCodec_GifModule : public ICodec_GifModule { public: - CCodec_GifModule() { FXSYS_memset(m_szLastError, 0, sizeof(m_szLastError)); } - - FXGIF_Context* Start(void* pModule); - void Finish(FXGIF_Context* pContext); + CCodec_GifModule(); + ~CCodec_GifModule() override; + FXGIF_Context* Start() override; + void Finish(FXGIF_Context* pContext) override; uint32_t GetAvailInput(FXGIF_Context* pContext, - uint8_t** avail_buf_ptr = nullptr); + uint8_t** avail_buf_ptr = nullptr) override; + void Input(FXGIF_Context* pContext, const uint8_t* src_buf, - uint32_t src_size); + uint32_t src_size) override; int32_t ReadHeader(FXGIF_Context* pContext, int* width, @@ -32,31 +31,12 @@ class CCodec_GifModule { int* pal_num, void** pal_pp, int* bg_index, - CFX_DIBAttribute* pAttribute); - - int32_t LoadFrameInfo(FXGIF_Context* pContext, int* frame_num); + CFX_DIBAttribute* pAttribute) override; + int32_t LoadFrameInfo(FXGIF_Context* pContext, int* frame_num) override; int32_t LoadFrame(FXGIF_Context* pContext, int frame_num, - CFX_DIBAttribute* pAttribute); - - void (*RecordCurrentPositionCallback)(void* pModule, uint32_t& cur_pos); - uint8_t* (*AskLocalPaletteBufCallback)(void* pModule, - int32_t frame_num, - int32_t pal_size); - bool (*InputRecordPositionBufCallback)(void* pModule, - uint32_t rcd_pos, - const FX_RECT& img_rc, - int32_t pal_num, - void* pal_ptr, - int32_t delay_time, - bool user_input, - int32_t trans_index, - int32_t disposal_method, - bool interlace); - void (*ReadScanlineCallback)(void* pModule, - int32_t row_num, - uint8_t* row_buf); + CFX_DIBAttribute* pAttribute) override; protected: FX_CHAR m_szLastError[256]; |