From dcdd29e266c282dc4020f297fcb5e5da9c1f1537 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 7 Oct 2015 21:26:47 -0700 Subject: Merge to XFA: Remove some dead code from CCodec_Jbig2Module. Variable was only ever set to false. TBR=dml@google.com Review URL: https://codereview.chromium.org/1393153002 . (cherry picked from commit 1f439a7a3b7c44235ecdac9a411add8fb62b0d83) Review URL: https://codereview.chromium.org/1392873003 . --- core/src/fxcodec/codec/codec_int.h | 1 - core/src/fxcodec/codec/fx_codec_jbig.cpp | 13 ------------- 2 files changed, 14 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index dad2953e12..043f62f0e3 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -363,7 +363,6 @@ class CCodec_Jbig2Context { FX_DWORD m_global_size; uint8_t* m_dest_buf; FX_DWORD m_dest_pitch; - FX_BOOL m_bFileReader; IFX_Pause* m_pPause; CJBig2_Context* m_pContext; CJBig2_Image* m_dest_image; diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp index 2cdff9f88c..18a665784a 100644 --- a/core/src/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp @@ -51,7 +51,6 @@ FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(void* pJbig2Context, m_pJbig2Context->m_dest_buf = dest_buf; m_pJbig2Context->m_dest_pitch = dest_pitch; m_pJbig2Context->m_pPause = pPause; - m_pJbig2Context->m_bFileReader = FALSE; FXSYS_memset(dest_buf, 0, height * dest_pitch); m_pJbig2Context->m_pContext = CJBig2_Context::CreateContext( global_data, global_size, src_buf, src_size, &m_SymbolDictCache, pPause); @@ -84,18 +83,6 @@ FXCODEC_STATUS CCodec_Jbig2Module::ContinueDecode(void* pJbig2Context, FXCODEC_STATUS_DECODE_FINISH) { return m_pJbig2Context->m_pContext->GetProcessingStatus(); } - if (m_pJbig2Context->m_bFileReader) { - CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext); - m_pJbig2Context->m_pContext = NULL; - if (ret != JBIG2_SUCCESS) { - FX_Free(m_pJbig2Context->m_src_buf); - m_pJbig2Context->m_src_buf = NULL; - return FXCODEC_STATUS_ERROR; - } - delete m_pJbig2Context->m_dest_image; - FX_Free(m_pJbig2Context->m_src_buf); - return FXCODEC_STATUS_DECODE_FINISH; - } CJBig2_Context::DestroyContext(m_pJbig2Context->m_pContext); m_pJbig2Context->m_pContext = NULL; if (ret != JBIG2_SUCCESS) { -- cgit v1.2.3