From 9c6b37c469e3f03abc7828d44b99d1d0b4a3259b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 31 May 2017 16:53:33 -0700 Subject: 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 Reviewed-by: Lei Zhang --- core/fxcodec/codec/ccodec_progressivedecoder.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/fxcodec/codec/ccodec_progressivedecoder.h') 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 m_pCodecMgr; // TODO(tsepez): All these contexts probably should be unique_ptrs. - FXJPEG_Context* m_pJpegContext; + CFX_UnownedPtr m_pJpegContext; CFX_UnownedPtr m_pPngContext; std::unique_ptr m_pGifContext; CCodec_BmpModule::Context* m_pBmpContext; -- cgit v1.2.3