summaryrefslogtreecommitdiff
path: root/core/fxcodec/jbig2/JBig2_GrdProc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_GrdProc.cpp')
-rw-r--r--core/fxcodec/jbig2/JBig2_GrdProc.cpp198
1 files changed, 99 insertions, 99 deletions
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
index 215d6fe6cf..054bfc5c15 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -87,7 +87,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate0Opt3(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x9b25]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
if (h > 1) {
uint8_t* pLine1 = pLine - nStride2;
@@ -170,7 +170,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate0Unopt(
if (!GBREG->data())
return nullptr;
- GBREG->fill(0);
+ GBREG->Fill(0);
int LTP = 0;
for (uint32_t h = 0; h < GBH; h++) {
if (TPGDON) {
@@ -180,36 +180,36 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate0Unopt(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x9b25]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
- uint32_t line1 = GBREG->getPixel(1, h - 2);
- line1 |= GBREG->getPixel(0, h - 2) << 1;
- uint32_t line2 = GBREG->getPixel(2, h - 1);
- line2 |= GBREG->getPixel(1, h - 1) << 1;
- line2 |= GBREG->getPixel(0, h - 1) << 2;
+ uint32_t line1 = GBREG->GetPixel(1, h - 2);
+ line1 |= GBREG->GetPixel(0, h - 2) << 1;
+ uint32_t line2 = GBREG->GetPixel(2, h - 1);
+ line2 |= GBREG->GetPixel(1, h - 1) << 1;
+ line2 |= GBREG->GetPixel(0, h - 1) << 2;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, h)) {
+ if (USESKIP && SKIP->GetPixel(w, h)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= GBREG->getPixel(w + GBAT[0], h + GBAT[1]) << 4;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[0], h + GBAT[1]) << 4;
CONTEXT |= line2 << 5;
- CONTEXT |= GBREG->getPixel(w + GBAT[2], h + GBAT[3]) << 10;
- CONTEXT |= GBREG->getPixel(w + GBAT[4], h + GBAT[5]) << 11;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[2], h + GBAT[3]) << 10;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[4], h + GBAT[5]) << 11;
CONTEXT |= line1 << 12;
- CONTEXT |= GBREG->getPixel(w + GBAT[6], h + GBAT[7]) << 15;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[6], h + GBAT[7]) << 15;
if (pArithDecoder->IsComplete())
return nullptr;
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- GBREG->setPixel(w, h, bVal);
+ GBREG->SetPixel(w, h, bVal);
}
- line1 = ((line1 << 1) | GBREG->getPixel(w + 2, h - 2)) & 0x07;
- line2 = ((line2 << 1) | GBREG->getPixel(w + 3, h - 1)) & 0x1f;
+ line1 = ((line1 << 1) | GBREG->GetPixel(w + 2, h - 2)) & 0x07;
+ line2 = ((line2 << 1) | GBREG->GetPixel(w + 3, h - 1)) & 0x1f;
line3 = ((line3 << 1) | bVal) & 0x0f;
}
}
@@ -238,7 +238,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate1Opt3(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x0795]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
if (h > 1) {
uint8_t* pLine1 = pLine - nStride2;
@@ -321,7 +321,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate1Unopt(
if (!GBREG->data())
return nullptr;
- GBREG->fill(0);
+ GBREG->Fill(0);
int LTP = 0;
for (uint32_t h = 0; h < GBH; h++) {
if (TPGDON) {
@@ -331,22 +331,22 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate1Unopt(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x0795]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
- uint32_t line1 = GBREG->getPixel(2, h - 2);
- line1 |= GBREG->getPixel(1, h - 2) << 1;
- line1 |= GBREG->getPixel(0, h - 2) << 2;
- uint32_t line2 = GBREG->getPixel(2, h - 1);
- line2 |= GBREG->getPixel(1, h - 1) << 1;
- line2 |= GBREG->getPixel(0, h - 1) << 2;
+ uint32_t line1 = GBREG->GetPixel(2, h - 2);
+ line1 |= GBREG->GetPixel(1, h - 2) << 1;
+ line1 |= GBREG->GetPixel(0, h - 2) << 2;
+ uint32_t line2 = GBREG->GetPixel(2, h - 1);
+ line2 |= GBREG->GetPixel(1, h - 1) << 1;
+ line2 |= GBREG->GetPixel(0, h - 1) << 2;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, h)) {
+ if (USESKIP && SKIP->GetPixel(w, h)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= GBREG->getPixel(w + GBAT[0], h + GBAT[1]) << 3;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[0], h + GBAT[1]) << 3;
CONTEXT |= line2 << 4;
CONTEXT |= line1 << 9;
if (pArithDecoder->IsComplete())
@@ -355,10 +355,10 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate1Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- GBREG->setPixel(w, h, bVal);
+ GBREG->SetPixel(w, h, bVal);
}
- line1 = ((line1 << 1) | GBREG->getPixel(w + 3, h - 2)) & 0x0f;
- line2 = ((line2 << 1) | GBREG->getPixel(w + 3, h - 1)) & 0x1f;
+ line1 = ((line1 << 1) | GBREG->GetPixel(w + 3, h - 2)) & 0x0f;
+ line2 = ((line2 << 1) | GBREG->GetPixel(w + 3, h - 1)) & 0x1f;
line3 = ((line3 << 1) | bVal) & 0x07;
}
}
@@ -387,7 +387,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate2Opt3(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x00e5]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
if (h > 1) {
uint8_t* pLine1 = pLine - nStride2;
@@ -470,7 +470,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate2Unopt(
if (!GBREG->data())
return nullptr;
- GBREG->fill(0);
+ GBREG->Fill(0);
int LTP = 0;
for (uint32_t h = 0; h < GBH; h++) {
if (TPGDON) {
@@ -480,20 +480,20 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate2Unopt(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x00e5]);
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
- uint32_t line1 = GBREG->getPixel(1, h - 2);
- line1 |= GBREG->getPixel(0, h - 2) << 1;
- uint32_t line2 = GBREG->getPixel(1, h - 1);
- line2 |= GBREG->getPixel(0, h - 1) << 1;
+ uint32_t line1 = GBREG->GetPixel(1, h - 2);
+ line1 |= GBREG->GetPixel(0, h - 2) << 1;
+ uint32_t line2 = GBREG->GetPixel(1, h - 1);
+ line2 |= GBREG->GetPixel(0, h - 1) << 1;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, h)) {
+ if (USESKIP && SKIP->GetPixel(w, h)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= GBREG->getPixel(w + GBAT[0], h + GBAT[1]) << 2;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[0], h + GBAT[1]) << 2;
CONTEXT |= line2 << 3;
CONTEXT |= line1 << 7;
if (pArithDecoder->IsComplete())
@@ -502,10 +502,10 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate2Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- GBREG->setPixel(w, h, bVal);
+ GBREG->SetPixel(w, h, bVal);
}
- line1 = ((line1 << 1) | GBREG->getPixel(w + 2, h - 2)) & 0x07;
- line2 = ((line2 << 1) | GBREG->getPixel(w + 2, h - 1)) & 0x0f;
+ line1 = ((line1 << 1) | GBREG->GetPixel(w + 2, h - 2)) & 0x07;
+ line2 = ((line2 << 1) | GBREG->GetPixel(w + 2, h - 1)) & 0x0f;
line3 = ((line3 << 1) | bVal) & 0x03;
}
}
@@ -535,7 +535,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate3Opt3(
}
if (LTP) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
if (h > 0) {
uint8_t* pLine1 = pLine - nStride;
@@ -605,7 +605,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate3Unopt(
if (!GBREG->data())
return nullptr;
- GBREG->fill(0);
+ GBREG->Fill(0);
int LTP = 0;
for (uint32_t h = 0; h < GBH; h++) {
if (TPGDON) {
@@ -615,18 +615,18 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate3Unopt(
LTP = LTP ^ pArithDecoder->Decode(&gbContext[0x0195]);
}
if (LTP == 1) {
- GBREG->copyLine(h, h - 1);
+ GBREG->CopyLine(h, h - 1);
} else {
- uint32_t line1 = GBREG->getPixel(1, h - 1);
- line1 |= GBREG->getPixel(0, h - 1) << 1;
+ uint32_t line1 = GBREG->GetPixel(1, h - 1);
+ line1 |= GBREG->GetPixel(0, h - 1) << 1;
uint32_t line2 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, h)) {
+ if (USESKIP && SKIP->GetPixel(w, h)) {
bVal = 0;
} else {
uint32_t CONTEXT = line2;
- CONTEXT |= GBREG->getPixel(w + GBAT[0], h + GBAT[1]) << 4;
+ CONTEXT |= GBREG->GetPixel(w + GBAT[0], h + GBAT[1]) << 4;
CONTEXT |= line1 << 5;
if (pArithDecoder->IsComplete())
return nullptr;
@@ -634,9 +634,9 @@ std::unique_ptr<CJBig2_Image> CJBig2_GRDProc::DecodeArithTemplate3Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- GBREG->setPixel(w, h, bVal);
+ GBREG->SetPixel(w, h, bVal);
}
- line1 = ((line1 << 1) | GBREG->getPixel(w + 2, h - 1)) & 0x1f;
+ line1 = ((line1 << 1) | GBREG->GetPixel(w + 2, h - 1)) & 0x1f;
line2 = ((line2 << 1) | bVal) & 0x0f;
}
}
@@ -659,7 +659,7 @@ FXCODEC_STATUS CJBig2_GRDProc::StartDecodeArith(
m_ProssiveStatus = FXCODEC_STATUS_ERROR;
return FXCODEC_STATUS_ERROR;
}
- pImage->get()->fill(0);
+ pImage->get()->Fill(0);
m_DecodeType = 1;
m_LTP = 0;
m_pLine = nullptr;
@@ -762,7 +762,7 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate0Opt3(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x9b25]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
if (m_loopIndex > 1) {
uint8_t* pLine1 = m_pLine - nStride2;
@@ -857,38 +857,38 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate0Unopt(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x9b25]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
- uint32_t line1 = pImage->getPixel(1, m_loopIndex - 2);
- line1 |= pImage->getPixel(0, m_loopIndex - 2) << 1;
- uint32_t line2 = pImage->getPixel(2, m_loopIndex - 1);
- line2 |= pImage->getPixel(1, m_loopIndex - 1) << 1;
- line2 |= pImage->getPixel(0, m_loopIndex - 1) << 2;
+ uint32_t line1 = pImage->GetPixel(1, m_loopIndex - 2);
+ line1 |= pImage->GetPixel(0, m_loopIndex - 2) << 1;
+ uint32_t line2 = pImage->GetPixel(2, m_loopIndex - 1);
+ line2 |= pImage->GetPixel(1, m_loopIndex - 1) << 1;
+ line2 |= pImage->GetPixel(0, m_loopIndex - 1) << 2;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
+ if (USESKIP && SKIP->GetPixel(w, m_loopIndex)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= pImage->getPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 4;
+ CONTEXT |= pImage->GetPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 4;
CONTEXT |= line2 << 5;
- CONTEXT |= pImage->getPixel(w + GBAT[2], m_loopIndex + GBAT[3]) << 10;
- CONTEXT |= pImage->getPixel(w + GBAT[4], m_loopIndex + GBAT[5]) << 11;
+ CONTEXT |= pImage->GetPixel(w + GBAT[2], m_loopIndex + GBAT[3]) << 10;
+ CONTEXT |= pImage->GetPixel(w + GBAT[4], m_loopIndex + GBAT[5]) << 11;
CONTEXT |= line1 << 12;
- CONTEXT |= pImage->getPixel(w + GBAT[6], m_loopIndex + GBAT[7]) << 15;
+ CONTEXT |= pImage->GetPixel(w + GBAT[6], m_loopIndex + GBAT[7]) << 15;
if (pArithDecoder->IsComplete())
return FXCODEC_STATUS_ERROR;
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- pImage->setPixel(w, m_loopIndex, bVal);
+ pImage->SetPixel(w, m_loopIndex, bVal);
}
line1 =
- ((line1 << 1) | pImage->getPixel(w + 2, m_loopIndex - 2)) & 0x07;
+ ((line1 << 1) | pImage->GetPixel(w + 2, m_loopIndex - 2)) & 0x07;
line2 =
- ((line2 << 1) | pImage->getPixel(w + 3, m_loopIndex - 1)) & 0x1f;
+ ((line2 << 1) | pImage->GetPixel(w + 3, m_loopIndex - 1)) & 0x1f;
line3 = ((line3 << 1) | bVal) & 0x0f;
}
}
@@ -921,7 +921,7 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate1Opt3(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x0795]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
if (m_loopIndex > 1) {
uint8_t* pLine1 = m_pLine - nStride2;
@@ -1016,22 +1016,22 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate1Unopt(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x0795]);
}
if (m_LTP) {
- pImage->copyLine(h, h - 1);
+ pImage->CopyLine(h, h - 1);
} else {
- uint32_t line1 = pImage->getPixel(2, h - 2);
- line1 |= pImage->getPixel(1, h - 2) << 1;
- line1 |= pImage->getPixel(0, h - 2) << 2;
- uint32_t line2 = pImage->getPixel(2, h - 1);
- line2 |= pImage->getPixel(1, h - 1) << 1;
- line2 |= pImage->getPixel(0, h - 1) << 2;
+ uint32_t line1 = pImage->GetPixel(2, h - 2);
+ line1 |= pImage->GetPixel(1, h - 2) << 1;
+ line1 |= pImage->GetPixel(0, h - 2) << 2;
+ uint32_t line2 = pImage->GetPixel(2, h - 1);
+ line2 |= pImage->GetPixel(1, h - 1) << 1;
+ line2 |= pImage->GetPixel(0, h - 1) << 2;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, h)) {
+ if (USESKIP && SKIP->GetPixel(w, h)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= pImage->getPixel(w + GBAT[0], h + GBAT[1]) << 3;
+ CONTEXT |= pImage->GetPixel(w + GBAT[0], h + GBAT[1]) << 3;
CONTEXT |= line2 << 4;
CONTEXT |= line1 << 9;
if (pArithDecoder->IsComplete())
@@ -1040,10 +1040,10 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate1Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- pImage->setPixel(w, h, bVal);
+ pImage->SetPixel(w, h, bVal);
}
- line1 = ((line1 << 1) | pImage->getPixel(w + 3, h - 2)) & 0x0f;
- line2 = ((line2 << 1) | pImage->getPixel(w + 3, h - 1)) & 0x1f;
+ line1 = ((line1 << 1) | pImage->GetPixel(w + 3, h - 2)) & 0x0f;
+ line2 = ((line2 << 1) | pImage->GetPixel(w + 3, h - 1)) & 0x1f;
line3 = ((line3 << 1) | bVal) & 0x07;
}
}
@@ -1076,7 +1076,7 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate2Opt3(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x00e5]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
if (m_loopIndex > 1) {
uint8_t* pLine1 = m_pLine - nStride2;
@@ -1172,20 +1172,20 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate2Unopt(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x00e5]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
- uint32_t line1 = pImage->getPixel(1, m_loopIndex - 2);
- line1 |= pImage->getPixel(0, m_loopIndex - 2) << 1;
- uint32_t line2 = pImage->getPixel(1, m_loopIndex - 1);
- line2 |= pImage->getPixel(0, m_loopIndex - 1) << 1;
+ uint32_t line1 = pImage->GetPixel(1, m_loopIndex - 2);
+ line1 |= pImage->GetPixel(0, m_loopIndex - 2) << 1;
+ uint32_t line2 = pImage->GetPixel(1, m_loopIndex - 1);
+ line2 |= pImage->GetPixel(0, m_loopIndex - 1) << 1;
uint32_t line3 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
+ if (USESKIP && SKIP->GetPixel(w, m_loopIndex)) {
bVal = 0;
} else {
uint32_t CONTEXT = line3;
- CONTEXT |= pImage->getPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 2;
+ CONTEXT |= pImage->GetPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 2;
CONTEXT |= line2 << 3;
CONTEXT |= line1 << 7;
if (pArithDecoder->IsComplete())
@@ -1194,12 +1194,12 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate2Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- pImage->setPixel(w, m_loopIndex, bVal);
+ pImage->SetPixel(w, m_loopIndex, bVal);
}
line1 =
- ((line1 << 1) | pImage->getPixel(w + 2, m_loopIndex - 2)) & 0x07;
+ ((line1 << 1) | pImage->GetPixel(w + 2, m_loopIndex - 2)) & 0x07;
line2 =
- ((line2 << 1) | pImage->getPixel(w + 2, m_loopIndex - 1)) & 0x0f;
+ ((line2 << 1) | pImage->GetPixel(w + 2, m_loopIndex - 1)) & 0x0f;
line3 = ((line3 << 1) | bVal) & 0x03;
}
}
@@ -1231,7 +1231,7 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate3Opt3(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x0195]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
if (m_loopIndex > 0) {
uint8_t* pLine1 = m_pLine - nStride;
@@ -1313,18 +1313,18 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate3Unopt(
m_LTP = m_LTP ^ pArithDecoder->Decode(&gbContext[0x0195]);
}
if (m_LTP) {
- pImage->copyLine(m_loopIndex, m_loopIndex - 1);
+ pImage->CopyLine(m_loopIndex, m_loopIndex - 1);
} else {
- uint32_t line1 = pImage->getPixel(1, m_loopIndex - 1);
- line1 |= pImage->getPixel(0, m_loopIndex - 1) << 1;
+ uint32_t line1 = pImage->GetPixel(1, m_loopIndex - 1);
+ line1 |= pImage->GetPixel(0, m_loopIndex - 1) << 1;
uint32_t line2 = 0;
for (uint32_t w = 0; w < GBW; w++) {
int bVal;
- if (USESKIP && SKIP->getPixel(w, m_loopIndex)) {
+ if (USESKIP && SKIP->GetPixel(w, m_loopIndex)) {
bVal = 0;
} else {
uint32_t CONTEXT = line2;
- CONTEXT |= pImage->getPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 4;
+ CONTEXT |= pImage->GetPixel(w + GBAT[0], m_loopIndex + GBAT[1]) << 4;
CONTEXT |= line1 << 5;
if (pArithDecoder->IsComplete())
return FXCODEC_STATUS_ERROR;
@@ -1332,10 +1332,10 @@ FXCODEC_STATUS CJBig2_GRDProc::ProgressiveDecodeArithTemplate3Unopt(
bVal = pArithDecoder->Decode(&gbContext[CONTEXT]);
}
if (bVal) {
- pImage->setPixel(w, m_loopIndex, bVal);
+ pImage->SetPixel(w, m_loopIndex, bVal);
}
line1 =
- ((line1 << 1) | pImage->getPixel(w + 2, m_loopIndex - 1)) & 0x1f;
+ ((line1 << 1) | pImage->GetPixel(w + 2, m_loopIndex - 1)) & 0x1f;
line2 = ((line2 << 1) | bVal) & 0x0f;
}
}