2 files changed, 11 insertions, 3 deletions
diff --git a/core/fxcodec/jbig2/JBig2_GrrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrrdProc.cpp
index 5542ec53ed..e67377622b 100644
--- a/core/fxcodec/jbig2/JBig2_GrrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrrdProc.cpp
@@ -13,6 +13,10 @@
 #include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "third_party/base/ptr_util.h"
 
+CJBig2_GRRDProc::CJBig2_GRRDProc() = default;
+
+CJBig2_GRRDProc::~CJBig2_GRRDProc() = default;
+
 std::unique_ptr<CJBig2_Image> CJBig2_GRRDProc::Decode(
     CJBig2_ArithDecoder* pArithDecoder,
     JBig2ArithCtx* grContext) {
diff --git a/core/fxcodec/jbig2/JBig2_GrrdProc.h b/core/fxcodec/jbig2/JBig2_GrrdProc.h
index 6ec3dd0b05..ec178a24c2 100644
--- a/core/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_Image;
@@ -17,16 +18,19 @@ struct JBig2ArithCtx;
 
 class CJBig2_GRRDProc {
  public:
+  CJBig2_GRRDProc();
+  ~CJBig2_GRRDProc();
+
   std::unique_ptr<CJBig2_Image> Decode(CJBig2_ArithDecoder* pArithDecoder,
                                        JBig2ArithCtx* grContext);
 
+  bool GRTEMPLATE;
+  bool TPGRON;
   uint32_t GRW;
   uint32_t GRH;
-  bool GRTEMPLATE;
-  CJBig2_Image* GRREFERENCE;
   int32_t GRREFERENCEDX;
   int32_t GRREFERENCEDY;
-  bool TPGRON;
+  UnownedPtr<CJBig2_Image> GRREFERENCE;
   int8_t GRAT[4];
 
  private: