2 files changed, 20 insertions, 12 deletions
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/fxcodec/jbig2/JBig2_TrdProc.cpp
index 79b2142a9f..4f082f376f 100644
--- a/core/fxcodec/jbig2/JBig2_TrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_TrdProc.cpp
@@ -39,9 +39,13 @@ Optional<int32_t> CheckTRDReferenceDimension(int32_t dimension,
 
 }  // namespace
 
-CJBig2_TRDProc::CJBig2_TRDProc() {}
+JBig2IntDecoderState::JBig2IntDecoderState() = default;
 
-CJBig2_TRDProc::~CJBig2_TRDProc() {}
+JBig2IntDecoderState::~JBig2IntDecoderState() = default;
+
+CJBig2_TRDProc::CJBig2_TRDProc() = default;
+
+CJBig2_TRDProc::~CJBig2_TRDProc() = default;
 
 std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::DecodeHuffman(
     CJBig2_BitStream* pStream,
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.h b/core/fxcodec/jbig2/JBig2_TrdProc.h
index 1d90bf4bd6..52c5322ec4 100644
--- a/core/fxcodec/jbig2/JBig2_TrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_TrdProc.h
@@ -12,6 +12,7 @@
 
 #include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_ArithIaidDecoder;
@@ -22,16 +23,19 @@ struct JBig2ArithCtx;
 struct JBig2HuffmanCode;
 
 struct JBig2IntDecoderState {
-  CJBig2_ArithIntDecoder* IADT;
-  CJBig2_ArithIntDecoder* IAFS;
-  CJBig2_ArithIntDecoder* IADS;
-  CJBig2_ArithIntDecoder* IAIT;
-  CJBig2_ArithIntDecoder* IARI;
-  CJBig2_ArithIntDecoder* IARDW;
-  CJBig2_ArithIntDecoder* IARDH;
-  CJBig2_ArithIntDecoder* IARDX;
-  CJBig2_ArithIntDecoder* IARDY;
-  CJBig2_ArithIaidDecoder* IAID;
+  JBig2IntDecoderState();
+  ~JBig2IntDecoderState();
+
+  UnownedPtr<CJBig2_ArithIntDecoder> IADT;
+  UnownedPtr<CJBig2_ArithIntDecoder> IAFS;
+  UnownedPtr<CJBig2_ArithIntDecoder> IADS;
+  UnownedPtr<CJBig2_ArithIntDecoder> IAIT;
+  UnownedPtr<CJBig2_ArithIntDecoder> IARI;
+  UnownedPtr<CJBig2_ArithIntDecoder> IARDW;
+  UnownedPtr<CJBig2_ArithIntDecoder> IARDH;
+  UnownedPtr<CJBig2_ArithIntDecoder> IARDX;
+  UnownedPtr<CJBig2_ArithIntDecoder> IARDY;
+  UnownedPtr<CJBig2_ArithIaidDecoder> IAID;
 };
 
 enum JBig2Corner {