diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-25 13:30:33 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-25 21:09:16 +0000 |
| commit | 87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1 (patch) | |
| tree | 362411e98aaba708c4c6b6a635fbcaee2122426c /core/fxcodec/codec/ccodec_progressivedecoder.h | |
| parent | 80547a165adf250f31ade57544771201bbc2690c (diff) | |
| download | pdfium-87d1c1fc1dc4455cb3695ed2df1a5fdf31e870b1.tar.xz | |
Remove remaining ICodec_* abstract classes
They are only implemented in one way, and the layering does not
required an interface here.
Change-Id: Id87591ca237fb66dbfc5aa62b4cc11c2464f5ffa
Reviewed-on: https://pdfium-review.googlesource.com/4496
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_progressivedecoder.h')
| -rw-r--r-- | core/fxcodec/codec/ccodec_progressivedecoder.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index cd96ee76a0..6081fe3c19 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -9,10 +9,10 @@ #include <vector> -#include "core/fxcodec/codec/icodec_bmpmodule.h" -#include "core/fxcodec/codec/icodec_gifmodule.h" -#include "core/fxcodec/codec/icodec_pngmodule.h" -#include "core/fxcodec/codec/icodec_tiffmodule.h" +#include "core/fxcodec/codec/ccodec_bmpmodule.h" +#include "core/fxcodec/codec/ccodec_gifmodule.h" +#include "core/fxcodec/codec/ccodec_pngmodule.h" +#include "core/fxcodec/codec/ccodec_tiffmodule.h" #include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" @@ -25,9 +25,9 @@ class IFX_SeekableReadStream; class IFX_Pause; struct FXJPEG_Context; -class CCodec_ProgressiveDecoder : public ICodec_BmpModule::Delegate, - public ICodec_GifModule::Delegate, - public ICodec_PngModule::Delegate { +class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, + public CCodec_GifModule::Delegate, + public CCodec_PngModule::Delegate { public: enum FXCodec_Format { FXCodec_Invalid = 0, @@ -168,7 +168,7 @@ class CCodec_ProgressiveDecoder : public ICodec_BmpModule::Delegate, bool m_BmpIsTopBottom; FXCODEC_STATUS m_status; - // ICodec_PngModule::Delegate + // CCodec_PngModule::Delegate bool PngReadHeader(int width, int height, int bpc, @@ -178,7 +178,7 @@ class CCodec_ProgressiveDecoder : public ICodec_BmpModule::Delegate, bool PngAskScanlineBuf(int line, uint8_t*& src_buf) override; void PngFillScanlineBufCompleted(int pass, int line) override; - // ICodec_GifModule::Delegate + // CCodec_GifModule::Delegate void GifRecordCurrentPosition(uint32_t& cur_pos) override; uint8_t* GifAskLocalPaletteBuf(int32_t frame_num, int32_t pal_size) override; bool GifInputRecordPositionBuf(uint32_t rcd_pos, @@ -192,14 +192,14 @@ class CCodec_ProgressiveDecoder : public ICodec_BmpModule::Delegate, bool interlace) override; void GifReadScanline(int32_t row_num, uint8_t* row_buf) override; - // ICodec_BmpModule::Delegate + // CCodec_BmpModule::Delegate bool BmpInputImagePositionBuf(uint32_t rcd_pos) override; void BmpReadScanline(int32_t row_num, uint8_t* row_buf) override; protected: - bool BmpReadMoreData(ICodec_BmpModule* pBmpModule, + bool BmpReadMoreData(CCodec_BmpModule* pBmpModule, FXCODEC_STATUS& err_status); - bool GifReadMoreData(ICodec_GifModule* pGifModule, + bool GifReadMoreData(CCodec_GifModule* pGifModule, FXCODEC_STATUS& err_status); void GifDoubleLineResampleVert( const CFX_RetainPtr<CFX_DIBitmap>& pDeviceBitmap, |