diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-09-25 20:06:50 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-25 20:06:50 +0000 |
commit | 958142efa4561b5efd52733ad6c3b889cf49b3ae (patch) | |
tree | da605e08bceccbae3e23d87471c197b37ac48e28 /core/fxcodec/codec/ccodec_pngmodule.h | |
parent | fed6e124109f089a38e24e37b104d983231bee78 (diff) | |
download | pdfium-958142efa4561b5efd52733ad6c3b889cf49b3ae.tar.xz |
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 <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_pngmodule.h')
-rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/fxcodec/codec/ccodec_pngmodule.h b/core/fxcodec/codec/ccodec_pngmodule.h index 847f67e8eb..e97a221dfc 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.h +++ b/core/fxcodec/codec/ccodec_pngmodule.h @@ -9,17 +9,13 @@ #include <memory> +#include "core/fxcodec/codec/codec_module_iface.h" #include "core/fxcrt/fx_system.h" class CFX_DIBAttribute; -class CCodec_PngModule { +class CCodec_PngModule final : public CodecModuleIface { public: - class Context { - public: - virtual ~Context() {} - }; - class Delegate { public: virtual bool PngReadHeader(int width, @@ -36,11 +32,13 @@ class CCodec_PngModule { virtual void PngFillScanlineBufCompleted(int pass, int line) = 0; }; - std::unique_ptr<Context> Start(Delegate* pDelegate); + // CodecModuleIface: + FX_FILESIZE GetAvailInput(Context* pContext) const override; bool Input(Context* pContext, - const uint8_t* src_buf, - uint32_t src_size, - CFX_DIBAttribute* pAttribute); + pdfium::span<uint8_t> src_buf, + CFX_DIBAttribute* pAttribute) override; + + std::unique_ptr<Context> Start(Delegate* pDelegate); }; #endif // CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_ |