Use smart pointers for various Jbig2 decoding contexts

core/fxcodec/codec/fx_codec_jbig.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/ccodec_jbig2module.h"
 
 #include <list>
 
@@ skipping 19 matching lines @@
   std::list<CJBig2_CachePair> m_SymbolDictCache;
 };
 
 JBig2DocumentContext* GetJBig2DocumentContext(
     std::unique_ptr<CFX_Deletable>* pContextHolder) {
   if (!pContextHolder->get())
     pContextHolder->reset(new JBig2DocumentContext());
   return static_cast<JBig2DocumentContext*>(pContextHolder->get());
 }
 
-CCodec_Jbig2Context::CCodec_Jbig2Context() {
-  FXSYS_memset(this, 0, sizeof(CCodec_Jbig2Context));
-}
+CCodec_Jbig2Context::CCodec_Jbig2Context()
+    : m_width(0),
+      m_height(0),
+      m_pGlobalStream(nullptr),
+      m_pSrcStream(nullptr),
+      m_dest_buf(0),
+      m_dest_pitch(0),
+      m_pPause(nullptr) {}
+
+CCodec_Jbig2Context::~CCodec_Jbig2Context() {}
 
 CCodec_Jbig2Module::~CCodec_Jbig2Module() {}
 
-CCodec_Jbig2Context* CCodec_Jbig2Module::CreateJbig2Context() {
-  return new CCodec_Jbig2Context();
-}
-
-void CCodec_Jbig2Module::DestroyJbig2Context(
-    CCodec_Jbig2Context* pJbig2Context) {
-  if (pJbig2Context) {
-    CJBig2_Context::DestroyContext(pJbig2Context->m_pContext);
-    delete pJbig2Context;
-  }
-  pJbig2Context = nullptr;
-}
-
 FXCODEC_STATUS CCodec_Jbig2Module::StartDecode(
     CCodec_Jbig2Context* pJbig2Context,
     std::unique_ptr<CFX_Deletable>* pContextHolder,
     uint32_t width,
     uint32_t height,
     CPDF_StreamAcc* src_stream,
     CPDF_StreamAcc* global_stream,
     uint8_t* dest_buf,
     uint32_t dest_pitch,
     IFX_Pause* pPause) {
   if (!pJbig2Context)
     return FXCODEC_STATUS_ERR_PARAMS;
 
   JBig2DocumentContext* pJBig2DocumentContext =
       GetJBig2DocumentContext(pContextHolder);
   pJbig2Context->m_width = width;
   pJbig2Context->m_height = height;
   pJbig2Context->m_pSrcStream = src_stream;
   pJbig2Context->m_pGlobalStream = global_stream;
   pJbig2Context->m_dest_buf = dest_buf;
   pJbig2Context->m_dest_pitch = dest_pitch;
   pJbig2Context->m_pPause = pPause;
   FXSYS_memset(dest_buf, 0, height * dest_pitch);
-  pJbig2Context->m_pContext = CJBig2_Context::CreateContext(
+  pJbig2Context->m_pContext.reset(new CJBig2_Context(
       global_stream, src_stream, pJBig2DocumentContext->GetSymbolDictCache(),
-      pPause);
+      pPause, false));
   if (!pJbig2Context->m_pContext)
     return FXCODEC_STATUS_ERROR;
 
   int ret = pJbig2Context->m_pContext->getFirstPage(dest_buf, width, height,
                                                     dest_pitch, pPause);
   if (pJbig2Context->m_pContext->GetProcessingStatus() ==
       FXCODEC_STATUS_DECODE_FINISH) {
-    CJBig2_Context::DestroyContext(pJbig2Context->m_pContext);
-    pJbig2Context->m_pContext = nullptr;
+    pJbig2Context->m_pContext.reset();
     if (ret != JBIG2_SUCCESS)
       return FXCODEC_STATUS_ERROR;
 
     int dword_size = height * dest_pitch / 4;
     uint32_t* dword_buf = (uint32_t*)dest_buf;
     for (int i = 0; i < dword_size; i++)
       dword_buf[i] = ~dword_buf[i];
     return FXCODEC_STATUS_DECODE_FINISH;
   }
   return pJbig2Context->m_pContext->GetProcessingStatus();
 }
 
 FXCODEC_STATUS CCodec_Jbig2Module::ContinueDecode(
     CCodec_Jbig2Context* pJbig2Context,
     IFX_Pause* pPause) {
   int ret = pJbig2Context->m_pContext->Continue(pPause);
   if (pJbig2Context->m_pContext->GetProcessingStatus() !=
       FXCODEC_STATUS_DECODE_FINISH) {
     return pJbig2Context->m_pContext->GetProcessingStatus();
   }
-  CJBig2_Context::DestroyContext(pJbig2Context->m_pContext);
-  pJbig2Context->m_pContext = nullptr;
+  pJbig2Context->m_pContext.reset();
   if (ret != JBIG2_SUCCESS)
     return FXCODEC_STATUS_ERROR;
 
   int dword_size = pJbig2Context->m_height * pJbig2Context->m_dest_pitch / 4;
   uint32_t* dword_buf = (uint32_t*)pJbig2Context->m_dest_buf;
   for (int i = 0; i < dword_size; i++)
     dword_buf[i] = ~dword_buf[i];
   return FXCODEC_STATUS_DECODE_FINISH;
 }