diff options
author | Lei Zhang <thestig@chromium.org> | 2015-08-14 21:49:19 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 21:49:19 -0700 |
commit | 62b2e912dc2a508972fbf01b25f7449c39ff1543 (patch) | |
tree | 47a244dc5891b2a338ca529b796e12994e642cbc /core/src/fxcodec/codec/fx_codec_fax.cpp | |
parent | bdf72c353af5b8a34ef5efdeddfff36d2089a158 (diff) | |
download | pdfium-62b2e912dc2a508972fbf01b25f7449c39ff1543.tar.xz |
Merge to XFA: Use override in more classes in core/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1292613003 .
(cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f)
Review URL: https://codereview.chromium.org/1296043002 .
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_fax.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_fax.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp index 4260309380..34c07ac484 100644 --- a/core/src/fxcodec/codec/fx_codec_fax.cpp +++ b/core/src/fxcodec/codec/fx_codec_fax.cpp @@ -455,10 +455,12 @@ FX_BOOL _FaxGet1DLine(const uint8_t* src_buf, } return TRUE; } + class CCodec_FaxDecoder : public CCodec_ScanlineDecoder { public: CCodec_FaxDecoder(); - virtual ~CCodec_FaxDecoder(); + ~CCodec_FaxDecoder() override; + FX_BOOL Create(const uint8_t* src_buf, FX_DWORD src_size, int width, @@ -469,10 +471,13 @@ class CCodec_FaxDecoder : public CCodec_ScanlineDecoder { FX_BOOL BlackIs1, int Columns, int Rows); - virtual void v_DownScale(int dest_width, int dest_height) {} - virtual FX_BOOL v_Rewind(); - virtual uint8_t* v_GetNextLine(); - virtual FX_DWORD GetSrcOffset(); + + // CCodec_ScanlineDecoder + void v_DownScale(int dest_width, int dest_height) override {} + FX_BOOL v_Rewind() override; + uint8_t* v_GetNextLine() override; + FX_DWORD GetSrcOffset() override; + int m_Encoding, m_bEndOfLine, m_bByteAlign, m_bBlack; int bitpos; const uint8_t* m_pSrcBuf; @@ -480,6 +485,7 @@ class CCodec_FaxDecoder : public CCodec_ScanlineDecoder { uint8_t* m_pScanlineBuf; uint8_t* m_pRefBuf; }; + CCodec_FaxDecoder::CCodec_FaxDecoder() { m_pScanlineBuf = NULL; m_pRefBuf = NULL; |