diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-20 23:20:36 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-20 23:20:36 +0000 |
| commit | b2b00c31f48c86a1bde7f3e6c07752d1c9195cea (patch) | |
| tree | 72c75e7480ce8f16e247afc38d09ec8cbcd5bdfc /core/fxcodec/jbig2/JBig2_GrdProc.h | |
| parent | 7def3de1d026a7e99017113d0f17556a3130eba5 (diff) | |
| download | pdfium-b2b00c31f48c86a1bde7f3e6c07752d1c9195cea.tar.xz | |
Use UnownedPtr<> in JBig2_GrdProc.h
Pack a little tighter while we're at it.
Change-Id: I8cbefe5df1b4340cb55ea14a5ae00ebc1ad07114
Reviewed-on: https://pdfium-review.googlesource.com/40774
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_GrdProc.h')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_GrdProc.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h index 0ee52512d9..a78e8cdbc1 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.h +++ b/core/fxcodec/jbig2/JBig2_GrdProc.h @@ -22,11 +22,15 @@ struct JBig2ArithCtx; class CJBig2_GRDProc { public: - struct ProgressiveArithDecodeState { + class ProgressiveArithDecodeState { + public: + ProgressiveArithDecodeState(); + ~ProgressiveArithDecodeState(); + std::unique_ptr<CJBig2_Image>* pImage; - CJBig2_ArithDecoder* pArithDecoder; - JBig2ArithCtx* gbContext; - PauseIndicatorIface* pPause; + UnownedPtr<CJBig2_ArithDecoder> pArithDecoder; + UnownedPtr<JBig2ArithCtx> gbContext; + UnownedPtr<PauseIndicatorIface> pPause; }; CJBig2_GRDProc(); @@ -42,12 +46,12 @@ class CJBig2_GRDProc { const FX_RECT& GetReplaceRect() const { return m_ReplaceRect; } bool MMR; - uint32_t GBW; - uint32_t GBH; - uint8_t GBTEMPLATE; bool TPGDON; bool USESKIP; - CJBig2_Image* SKIP; + uint8_t GBTEMPLATE; + uint32_t GBW; + uint32_t GBH; + UnownedPtr<CJBig2_Image> SKIP; int8_t GBAT[8]; private: |