diff options
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_HtrdProc.cpp')
-rw-r--r-- | core/fxcodec/jbig2/JBig2_HtrdProc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp index ec692cacce..c1eaf918b5 100644 --- a/core/fxcodec/jbig2/JBig2_HtrdProc.cpp +++ b/core/fxcodec/jbig2/JBig2_HtrdProc.cpp @@ -14,7 +14,7 @@ #include "core/fxcodec/jbig2/JBig2_Image.h" #include "third_party/base/ptr_util.h" -std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_Arith( +std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::DecodeArith( CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, PauseIndicatorIface* pPause) { @@ -65,9 +65,9 @@ std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_Arith( for (int32_t i = GSBPP - 1; i >= 0; --i) { std::unique_ptr<CJBig2_Image> pImage; FXCODEC_STATUS status = - GRD.Start_decode_Arith(&pImage, pArithDecoder, gbContext, nullptr); + GRD.StartDecodeArith(&pImage, pArithDecoder, gbContext, nullptr); while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE) - status = GRD.Continue_decode(pPause, pArithDecoder); + status = GRD.ContinueDecode(pPause, pArithDecoder); if (!pImage) return nullptr; @@ -76,10 +76,10 @@ std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_Arith( if (i < GSBPP - 1) GSPLANES[i]->composeFrom(0, 0, GSPLANES[i + 1].get(), JBIG2_COMPOSE_XOR); } - return decode_image(GSPLANES); + return DecodeImage(GSPLANES); } -std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_MMR( +std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::DecodeMMR( CJBig2_BitStream* pStream) { uint32_t HBPP = 1; while (static_cast<uint32_t>(1 << HBPP) < HNUMPATS) @@ -92,14 +92,14 @@ std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_MMR( uint8_t GSBPP = static_cast<uint8_t>(HBPP); std::vector<std::unique_ptr<CJBig2_Image>> GSPLANES(GSBPP); - GRD.Start_decode_MMR(&GSPLANES[GSBPP - 1], pStream); + GRD.StartDecodeMMR(&GSPLANES[GSBPP - 1], pStream); if (!GSPLANES[GSBPP - 1]) return nullptr; pStream->alignByte(); pStream->offset(3); for (int32_t J = GSBPP - 2; J >= 0; --J) { - GRD.Start_decode_MMR(&GSPLANES[J], pStream); + GRD.StartDecodeMMR(&GSPLANES[J], pStream); if (!GSPLANES[J]) return nullptr; @@ -107,10 +107,10 @@ std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_MMR( pStream->offset(3); GSPLANES[J]->composeFrom(0, 0, GSPLANES[J + 1].get(), JBIG2_COMPOSE_XOR); } - return decode_image(GSPLANES); + return DecodeImage(GSPLANES); } -std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::decode_image( +std::unique_ptr<CJBig2_Image> CJBig2_HTRDProc::DecodeImage( const std::vector<std::unique_ptr<CJBig2_Image>>& GSPLANES) { auto HTREG = pdfium::MakeUnique<CJBig2_Image>(HBW, HBH); HTREG->fill(HDEFPIXEL); |