From a7f5386053136db6d41b1fc4943544ec623704c3 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 10 Sep 2015 16:34:17 -0700 Subject: Merge to XFA: Make a bunch of JBig2 classes independent of CJBig2_Object. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1319713003 . (cherry picked from commit 800bf5ac07305ccf9c9522c8c76f728a4fd99da5) Review URL: https://codereview.chromium.org/1332153002 . --- core/src/fxcodec/jbig2/JBig2_ArithDecoder.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'core/src/fxcodec/jbig2/JBig2_ArithDecoder.h') diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h index 0258014927..7acfe9cd36 100644 --- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h +++ b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.h @@ -9,13 +9,15 @@ #include "JBig2_Define.h" #include "JBig2_BitStream.h" #include "JBig2_ArithQe.h" -typedef struct { + +struct JBig2ArithCtx { unsigned int MPS; unsigned int I; -} JBig2ArithCtx; -class CJBig2_ArithDecoder : public CJBig2_Object { +}; + +class CJBig2_ArithDecoder { public: - CJBig2_ArithDecoder(CJBig2_BitStream* pStream); + explicit CJBig2_ArithDecoder(CJBig2_BitStream* pStream); ~CJBig2_ArithDecoder(); @@ -23,14 +25,15 @@ class CJBig2_ArithDecoder : public CJBig2_Object { private: void INITDEC(); - void BYTEIN(); + unsigned char B; unsigned int C; unsigned int A; unsigned int CT; CJBig2_BitStream* m_pStream; }; + inline CJBig2_ArithDecoder::CJBig2_ArithDecoder(CJBig2_BitStream* pStream) { m_pStream = pStream; INITDEC(); -- cgit v1.2.3