diff options
| author | Nicolas Pena <npm@chromium.org> | 2018-06-14 20:46:21 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-14 20:46:21 +0000 |
| commit | ee3e3a4f3cbaa99ae3609f575ff9b2c329c5df2a (patch) | |
| tree | 92141d7fd3e3fd9f79a3c85e6ec62ab5e406c472 /core/fxcodec/jbig2/JBig2_GrdProc.h | |
| parent | e90469e4c9b22ff912c70ec70392cf607fb1ad57 (diff) | |
| download | pdfium-ee3e3a4f3cbaa99ae3609f575ff9b2c329c5df2a.tar.xz | |
Merge 3 methods of CJBig2_GRDProc togetherchromium/3465chromium/3464chromium/3463chromium/3462chromium/3461
This CL merges 3 methods into a single DecodeArithOpt3(). The code is
the same, except for some constants which are extracted out as namespace
variables.
Change-Id: I6d9127d71b5e7c4c75e31a736b0f3307bb78a076
Reviewed-on: https://pdfium-review.googlesource.com/35170
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_GrdProc.h')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_GrdProc.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h index 67d83ddec6..fddb424415 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.h +++ b/core/fxcodec/jbig2/JBig2_GrdProc.h @@ -73,21 +73,16 @@ class CJBig2_GRDProc { FXCODEC_STATUS ProgressiveDecodeArithTemplate3Unopt( ProgressiveArithDecodeState* pState); - std::unique_ptr<CJBig2_Image> DecodeArithTemplate0Opt3( + std::unique_ptr<CJBig2_Image> DecodeArithOpt3( CJBig2_ArithDecoder* pArithDecoder, - JBig2ArithCtx* gbContext); + JBig2ArithCtx* gbContext, + int OPT); std::unique_ptr<CJBig2_Image> DecodeArithTemplate0Unopt( CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext); - std::unique_ptr<CJBig2_Image> DecodeArithTemplate1Opt3( - CJBig2_ArithDecoder* pArithDecoder, - JBig2ArithCtx* gbContext); std::unique_ptr<CJBig2_Image> DecodeArithTemplate1Unopt( CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext); - std::unique_ptr<CJBig2_Image> DecodeArithTemplate2Opt3( - CJBig2_ArithDecoder* pArithDecoder, - JBig2ArithCtx* gbContext); std::unique_ptr<CJBig2_Image> DecodeArithTemplate2Unopt( CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext); |