diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-31 16:53:33 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-01 00:07:45 +0000 |
| commit | 9c6b37c469e3f03abc7828d44b99d1d0b4a3259b (patch) | |
| tree | 282e440930276d28fac3dcbf0ddd16d164611097 /core/fxcodec/codec/ccodec_jpegmodule.h | |
| parent | db9faec3c8fb3ced3d8340b2b6ae252b8f40d135 (diff) | |
| download | pdfium-9c6b37c469e3f03abc7828d44b99d1d0b4a3259b.tar.xz | |
Rename FXJPEG_Context and use unowned ptr
The module class itself is already stateless.
Clean up context in its dtor.
Change-Id: Icbab7b23ec9d3ceb773b74383056c12b61a38907
Reviewed-on: https://pdfium-review.googlesource.com/6151
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_jpegmodule.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_jpegmodule.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h index 7782b5fad1..276e46a55f 100644 --- a/core/fxcodec/codec/ccodec_jpegmodule.h +++ b/core/fxcodec/codec/ccodec_jpegmodule.h @@ -9,11 +9,11 @@ #include <memory> +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" class CCodec_ScanlineDecoder; class CFX_DIBSource; -struct FXJPEG_Context; #ifdef PDF_ENABLE_XFA class CFX_DIBAttribute; @@ -21,7 +21,7 @@ class CFX_DIBAttribute; class CCodec_JpegModule { public: - CCodec_JpegModule() {} + class Context; std::unique_ptr<CCodec_ScanlineDecoder> CreateDecoder(const uint8_t* src_buf, uint32_t src_size, @@ -36,28 +36,23 @@ class CCodec_JpegModule { int* num_components, int* bits_per_components, bool* color_transform); - FXJPEG_Context* Start(); - void Finish(FXJPEG_Context* pContext); - void Input(FXJPEG_Context* pContext, - const uint8_t* src_buf, - uint32_t src_size); + Context* Start(); + void Finish(Context* pContext); + void Input(Context* pContext, const uint8_t* src_buf, uint32_t src_size); #ifndef PDF_ENABLE_XFA - int ReadHeader(FXJPEG_Context* pContext, - int* width, - int* height, - int* nComps); + int ReadHeader(Context* pContext, int* width, int* height, int* nComps); #else // PDF_ENABLE_XFA - int ReadHeader(FXJPEG_Context* pContext, + int ReadHeader(Context* pContext, int* width, int* height, int* nComps, CFX_DIBAttribute* pAttribute); #endif // PDF_ENABLE_XFA - bool StartScanline(FXJPEG_Context* pContext, int down_scale); - bool ReadScanline(FXJPEG_Context* pContext, uint8_t* dest_buf); - uint32_t GetAvailInput(FXJPEG_Context* pContext, uint8_t** avail_buf_ptr); + bool StartScanline(Context* pContext, int down_scale); + bool ReadScanline(Context* pContext, uint8_t* dest_buf); + uint32_t GetAvailInput(Context* pContext, uint8_t** avail_buf_ptr); #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ static bool JpegEncode(const CFX_RetainPtr<CFX_DIBSource>& pSource, |