diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-05-11 18:44:29 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-12 16:06:57 +0000 |
| commit | 2199ab8e048ae19ee3ae01afe640ce3a66092a00 (patch) | |
| tree | 9902df65f20b9e9c67e6dc7ad8afdff5ecb9b8e7 /core/fxcodec/codec/ccodec_gifmodule.h | |
| parent | 3c58aa0bf51c64eb126be165e7478e70fbb68043 (diff) | |
| download | pdfium-2199ab8e048ae19ee3ae01afe640ce3a66092a00.tar.xz | |
Merge FXGIF_Context and CGifDecompressor into CGifContextchromium/3098
Change-Id: I60c9cbd83ff9e7a30a5a570a6ad1cf8f52360c07
Reviewed-on: https://pdfium-review.googlesource.com/5410
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_gifmodule.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_gifmodule.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h index 862bee5fe7..5f3f45f83f 100644 --- a/core/fxcodec/codec/ccodec_gifmodule.h +++ b/core/fxcodec/codec/ccodec_gifmodule.h @@ -7,12 +7,13 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_ +#include <memory> + #include "core/fxcodec/lgif/fx_gif.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" class CFX_DIBAttribute; -class FXGIF_Context; class CCodec_GifModule { public: @@ -34,16 +35,13 @@ class CCodec_GifModule { CCodec_GifModule(); ~CCodec_GifModule(); - FXGIF_Context* Start(); - void Finish(FXGIF_Context* pContext); - uint32_t GetAvailInput(FXGIF_Context* pContext, + std::unique_ptr<CGifContext> Start(); + uint32_t GetAvailInput(CGifContext* context, uint8_t** avail_buf_ptr = nullptr); - void Input(FXGIF_Context* pContext, - const uint8_t* src_buf, - uint32_t src_size); + void Input(CGifContext* context, const uint8_t* src_buf, uint32_t src_size); - GifDecodeStatus ReadHeader(FXGIF_Context* pContext, + GifDecodeStatus ReadHeader(CGifContext* context, int* width, int* height, int* pal_num, @@ -51,8 +49,8 @@ class CCodec_GifModule { int* bg_index, CFX_DIBAttribute* pAttribute); - GifDecodeStatus LoadFrameInfo(FXGIF_Context* pContext, int* frame_num); - GifDecodeStatus LoadFrame(FXGIF_Context* pContext, + GifDecodeStatus LoadFrameInfo(CGifContext* context, int* frame_num); + GifDecodeStatus LoadFrame(CGifContext* context, int frame_num, CFX_DIBAttribute* pAttribute); |