diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-21 20:55:17 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-21 20:55:17 +0000 |
| commit | 3cfe89d632315b6bdae3264cc75fc5ed06d36f45 (patch) | |
| tree | bb624a3d5ef4663cb20e827e6c455e8d3ecd2d86 | |
| parent | 4d5c1c96366637604b1900f462804dc427bbe403 (diff) | |
| download | pdfium-3cfe89d632315b6bdae3264cc75fc5ed06d36f45.tar.xz | |
Use UnownedPtr<> in CJBig2_TRDProc.
First real use case of assigning Unowned to MaybeOwned.
Change-Id: Ia5bc7102012f7a09120ba02d38cf751547d5c005
Reviewed-on: https://pdfium-review.googlesource.com/40914
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_TrdProc.cpp | 8 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_TrdProc.h | 24 |
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 { |