diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-10-02 22:13:15 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-02 22:13:15 +0000 |
| commit | f08dca093834baec1eb7357e4cab9fb1a14f3893 (patch) | |
| tree | 366876aa433fc34ec1c90e7f1f1093db981c9133 /core/fxcodec/codec/ccodec_progressivedecoder.h | |
| parent | 04c2dbb1908006830b6ee45ea85f6cde1a9fc4cb (diff) | |
| download | pdfium-f08dca093834baec1eb7357e4cab9fb1a14f3893.tar.xz | |
Consolidate ReadMoreData() calls.
Extract some dividends from having landed the previous CL.
Change-Id: I9ade77c801b51762cab801716b9fd2bc4c634036
Reviewed-on: https://pdfium-review.googlesource.com/c/41990
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_progressivedecoder.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_progressivedecoder.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 9a4572e452..9821c67f4f 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -200,12 +200,6 @@ class CCodec_ProgressiveDecoder : int dest_row); #endif // PDF_ENABLE_XFA_GIF - bool JpegReadMoreData(CCodec_JpegModule* pJpegModule, - FXCODEC_STATUS& err_status); - bool JpegDetectImageTypeInBuffer(CFX_DIBAttribute* pAttribute); - FXCODEC_STATUS JpegStartDecode(const RetainPtr<CFX_DIBitmap>& pDIBitmap); - FXCODEC_STATUS JpegContinueDecode(); - #ifdef PDF_ENABLE_XFA_PNG void PngOneOneMapResampleHorz(const RetainPtr<CFX_DIBitmap>& pDeviceBitmap, int32_t dest_line, @@ -221,8 +215,18 @@ class CCodec_ProgressiveDecoder : FXCODEC_STATUS TiffContinueDecode(); #endif // PDF_ENABLE_XFA_TIFF + bool JpegReadMoreData(CCodec_JpegModule* pJpegModule, + FXCODEC_STATUS& err_status); + bool JpegDetectImageTypeInBuffer(CFX_DIBAttribute* pAttribute); + FXCODEC_STATUS JpegStartDecode(const RetainPtr<CFX_DIBitmap>& pDIBitmap); + FXCODEC_STATUS JpegContinueDecode(); + bool DetectImageType(FXCODEC_IMAGE_TYPE imageType, CFX_DIBAttribute* pAttribute); + bool ReadMoreData(CodecModuleIface* pModule, + CodecModuleIface::Context* pContext, + bool invalidate_buffer, + FXCODEC_STATUS& err_status); void GetDownScale(int& down_scale); void GetTransMethod(FXDIB_Format dest_format, FXCodec_Format src_format); |