diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-22 17:34:42 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-22 17:34:42 +0000 |
| commit | dc7e7fa32798770243289827c9db2607061fb2a7 (patch) | |
| tree | 49b072a5cde02f73186f83a3bc6c669506dcdec1 /core/fxcodec/jbig2/JBig2_TrdProc.h | |
| parent | 962c1bc7e550b9466d802b0b94322693611fa30b (diff) | |
| download | pdfium-dc7e7fa32798770243289827c9db2607061fb2a7.tar.xz | |
Use UnownedPtr<> in JBig2_TrdProc, part 2.
Re-order some locals to obey strict lifetime constraint.
Pack a little tighter.
Change-Id: Iae011d21b934fac865cf10ac20c046c8917d3a98
Reviewed-on: https://pdfium-review.googlesource.com/40915
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_TrdProc.h')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_TrdProc.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.h b/core/fxcodec/jbig2/JBig2_TrdProc.h index 52c5322ec4..855a13accb 100644 --- a/core/fxcodec/jbig2/JBig2_TrdProc.h +++ b/core/fxcodec/jbig2/JBig2_TrdProc.h @@ -59,32 +59,28 @@ class CJBig2_TRDProc { bool SBHUFF; bool SBREFINE; + bool SBRTEMPLATE; + bool TRANSPOSED; + bool SBDEFPIXEL; + int8_t SBDSOFFSET; + uint8_t SBSYMCODELEN; uint32_t SBW; uint32_t SBH; uint32_t SBNUMINSTANCES; uint32_t SBSTRIPS; uint32_t SBNUMSYMS; - std::vector<JBig2HuffmanCode> SBSYMCODES; - uint8_t SBSYMCODELEN; - CJBig2_Image** SBSYMS; - bool SBDEFPIXEL; - JBig2ComposeOp SBCOMBOP; - bool TRANSPOSED; - JBig2Corner REFCORNER; - int8_t SBDSOFFSET; - const CJBig2_HuffmanTable* SBHUFFFS; - const CJBig2_HuffmanTable* SBHUFFDS; - const CJBig2_HuffmanTable* SBHUFFDT; - const CJBig2_HuffmanTable* SBHUFFRDW; - const CJBig2_HuffmanTable* SBHUFFRDH; - const CJBig2_HuffmanTable* SBHUFFRDX; - const CJBig2_HuffmanTable* SBHUFFRDY; - const CJBig2_HuffmanTable* SBHUFFRSIZE; - bool SBRTEMPLATE; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFFS; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFDS; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFDT; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFRDW; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFRDH; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFRDX; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFRDY; + UnownedPtr<const CJBig2_HuffmanTable> SBHUFFRSIZE; int8_t SBRAT[4]; private: |