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_progressivedecoder.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_progressivedecoder.h')
-rw-r--r-- | core/fxcodec/codec/ccodec_progressivedecoder.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 5ebb32397d..33ac558fc9 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -12,6 +12,7 @@ #include "core/fxcodec/codec/ccodec_bmpmodule.h" #include "core/fxcodec/codec/ccodec_gifmodule.h" +#include "core/fxcodec/codec/ccodec_jpegmodule.h" #include "core/fxcodec/codec/ccodec_pngmodule.h" #include "core/fxcodec/codec/ccodec_tiffmodule.h" #include "core/fxcodec/fx_codec_def.h" @@ -21,11 +22,9 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -class CCodec_JpegModule; class CCodec_ModuleMgr; class CFX_DIBAttribute; class IFX_SeekableReadStream; -struct FXJPEG_Context; class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, public CCodec_GifModule::Delegate, @@ -131,7 +130,7 @@ class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, CFX_UnownedPtr<CCodec_ModuleMgr> m_pCodecMgr; // TODO(tsepez): All these contexts probably should be unique_ptrs. - FXJPEG_Context* m_pJpegContext; + CFX_UnownedPtr<CCodec_JpegModule::Context> m_pJpegContext; CFX_UnownedPtr<CCodec_PngModule::Context> m_pPngContext; std::unique_ptr<CGifContext> m_pGifContext; CCodec_BmpModule::Context* m_pBmpContext; |