summaryrefslogtreecommitdiff
path: root/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp')
-rw-r--r--core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 7ed7702964..0d09b31faa 100644
--- a/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -32,7 +32,7 @@ size_t RecursiveDecode(CJBig2_ArithDecoder* decoder,
return kDepthEnd;
JBig2ArithCtx* pCX = &(*context)[*prev];
- int D = decoder->DECODE(pCX);
+ int D = decoder->Decode(pCX);
*prev = ShiftOr(*prev, D);
if (!D)
return depth;
@@ -47,13 +47,13 @@ CJBig2_ArithIntDecoder::CJBig2_ArithIntDecoder() {
CJBig2_ArithIntDecoder::~CJBig2_ArithIntDecoder() {}
-bool CJBig2_ArithIntDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
+bool CJBig2_ArithIntDecoder::Decode(CJBig2_ArithDecoder* pArithDecoder,
int* nResult) {
// This decoding algorithm is explained in "Annex A - Arithmetic Integer
// Decoding Procedure" on page 113 of the JBIG2 specification (ISO/IEC FCD
// 14492).
int PREV = 1;
- const int S = pArithDecoder->DECODE(&m_IAx[PREV]);
+ const int S = pArithDecoder->Decode(&m_IAx[PREV]);
PREV = ShiftOr(PREV, S);
const size_t nDecodeDataIndex =
@@ -61,7 +61,7 @@ bool CJBig2_ArithIntDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
int nTemp = 0;
for (int i = 0; i < g_ArithIntDecodeData[nDecodeDataIndex].nNeedBits; ++i) {
- int D = pArithDecoder->DECODE(&m_IAx[PREV]);
+ int D = pArithDecoder->Decode(&m_IAx[PREV]);
PREV = ShiftOr(PREV, D);
if (PREV >= 256)
PREV = (PREV & 511) | 256;
@@ -92,12 +92,12 @@ CJBig2_ArithIaidDecoder::CJBig2_ArithIaidDecoder(unsigned char SBSYMCODELENA)
CJBig2_ArithIaidDecoder::~CJBig2_ArithIaidDecoder() {}
-void CJBig2_ArithIaidDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
+void CJBig2_ArithIaidDecoder::Decode(CJBig2_ArithDecoder* pArithDecoder,
uint32_t* nResult) {
int PREV = 1;
for (unsigned char i = 0; i < SBSYMCODELEN; ++i) {
JBig2ArithCtx* pCX = &m_IAID[PREV];
- int D = pArithDecoder->DECODE(pCX);
+ int D = pArithDecoder->Decode(pCX);
PREV = ShiftOr(PREV, D);
}
*nResult = PREV - (1 << SBSYMCODELEN);