From 625ad667d0c0c17d5bc11d505f04861d90b45078 Mon Sep 17 00:00:00 2001 From: weili Date: Wed, 15 Jun 2016 11:21:33 -0700 Subject: Make code compile with clang_use_chrome_plugin (part IV) This change mainly contains files in fpdfsdk/ directory. This is part of the efforts to make PDFium code compilable by Clang chromium style plugins. The changes are mainly the following: -- move inline constructor/destructor of complex class/struct out-of-line; -- add constructor/destructor of complex class/struct if not explicitly defined; -- add explicit out-of-line copy constructor when needed; -- move inline virtual functions out-of-line; -- Properly mark virtual functions with 'override'; -- some minor cleanups plus removing an unused file and splitting cxfa_eventparam out from fxfa.h BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2062313002 --- core/fxcodec/codec/fx_codec_progress.cpp | 12 ++++++++++++ core/fxcodec/codec/include/ccodec_progressivedecoder.h | 13 +++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index d63bdb895a..04ca7b26c2 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -37,6 +37,10 @@ void RGB2BGR(uint8_t* buffer, int width = 1) { } // namespace +CCodec_ProgressiveDecoder::CFXCODEC_WeightTable::CFXCODEC_WeightTable() {} + +CCodec_ProgressiveDecoder::CFXCODEC_WeightTable::~CFXCODEC_WeightTable() {} + void CCodec_ProgressiveDecoder::CFXCODEC_WeightTable::Calc(int dest_len, int dest_min, int dest_max, @@ -136,6 +140,10 @@ void CCodec_ProgressiveDecoder::CFXCODEC_WeightTable::Calc(int dest_len, } } +CCodec_ProgressiveDecoder::CFXCODEC_HorzTable::CFXCODEC_HorzTable() {} + +CCodec_ProgressiveDecoder::CFXCODEC_HorzTable::~CFXCODEC_HorzTable() {} + void CCodec_ProgressiveDecoder::CFXCODEC_HorzTable::Calc(int dest_len, int src_len, FX_BOOL bInterpol) { @@ -189,6 +197,10 @@ void CCodec_ProgressiveDecoder::CFXCODEC_HorzTable::Calc(int dest_len, } } +CCodec_ProgressiveDecoder::CFXCODEC_VertTable::CFXCODEC_VertTable() {} + +CCodec_ProgressiveDecoder::CFXCODEC_VertTable::~CFXCODEC_VertTable() {} + void CCodec_ProgressiveDecoder::CFXCODEC_VertTable::Calc(int dest_len, int src_len) { double scale = (double)dest_len / (double)src_len; diff --git a/core/fxcodec/codec/include/ccodec_progressivedecoder.h b/core/fxcodec/codec/include/ccodec_progressivedecoder.h index 5df2c4f733..04b21da5ee 100644 --- a/core/fxcodec/codec/include/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/include/ccodec_progressivedecoder.h @@ -76,8 +76,8 @@ class CCodec_ProgressiveDecoder { class CFXCODEC_WeightTable { public: - CFXCODEC_WeightTable() {} - ~CFXCODEC_WeightTable() {} + CFXCODEC_WeightTable(); + ~CFXCODEC_WeightTable(); void Calc(int dest_len, int dest_min, @@ -98,8 +98,8 @@ class CCodec_ProgressiveDecoder { class CFXCODEC_HorzTable { public: - CFXCODEC_HorzTable() {} - ~CFXCODEC_HorzTable() {} + CFXCODEC_HorzTable(); + ~CFXCODEC_HorzTable(); void Calc(int dest_len, int src_len, FX_BOOL bInterpol); PixelWeight* GetPixelWeight(int pixel) { @@ -113,8 +113,9 @@ class CCodec_ProgressiveDecoder { class CFXCODEC_VertTable { public: - CFXCODEC_VertTable() {} - ~CFXCODEC_VertTable() {} + CFXCODEC_VertTable(); + ~CFXCODEC_VertTable(); + void Calc(int dest_len, int src_len); PixelWeight* GetPixelWeight(int pixel) { return reinterpret_cast(m_pWeightTables.data() + -- cgit v1.2.3