From 9a505796f3fe8c1d0cbc3f7e4e7db41fc1fde137 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 30 May 2017 09:36:04 -0700 Subject: Do not store pointer to IFX_Pause in CCodec_Jbig2Context It's passed everywhere it is needed, and there's no reason to believe that any specific instance will outlive the context. Bug: 727245 Change-Id: Ie902d02fc668fb5c21adb9c4d8eb329008f3a665 Reviewed-on: https://pdfium-review.googlesource.com/6078 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fxcodec/codec/ccodec_jbig2module.h | 2 -- core/fxcodec/codec/fx_codec_jbig.cpp | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h index e8dec945b8..b80d78f605 100644 --- a/core/fxcodec/codec/ccodec_jbig2module.h +++ b/core/fxcodec/codec/ccodec_jbig2module.h @@ -10,7 +10,6 @@ #include #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_basic.h" class CJBig2_Context; @@ -30,7 +29,6 @@ class CCodec_Jbig2Context { CFX_RetainPtr m_pSrcStream; uint8_t* m_dest_buf; uint32_t m_dest_pitch; - CFX_UnownedPtr m_pPause; std::unique_ptr m_pContext; }; diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp index 32d030e98d..4c545c3c3a 100644 --- a/core/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/fxcodec/codec/fx_codec_jbig.cpp @@ -33,8 +33,7 @@ CCodec_Jbig2Context::CCodec_Jbig2Context() m_pGlobalStream(nullptr), m_pSrcStream(nullptr), m_dest_buf(0), - m_dest_pitch(0), - m_pPause(nullptr) {} + m_dest_pitch(0) {} CCodec_Jbig2Context::~CCodec_Jbig2Context() {} @@ -61,7 +60,6 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode( pJbig2Context->m_pGlobalStream = global_stream; pJbig2Context->m_dest_buf = dest_buf; pJbig2Context->m_dest_pitch = dest_pitch; - pJbig2Context->m_pPause = pPause; memset(dest_buf, 0, height * dest_pitch); pJbig2Context->m_pContext = pdfium::MakeUnique( global_stream, src_stream, pJBig2DocumentContext->GetSymbolDictCache(), -- cgit v1.2.3