From 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 14 Jun 2016 18:20:04 -0700 Subject: Make code compile with clang_use_chrome_plugin (part III) This change contains files in xfa/fxbarcode 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; BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2067903002 --- xfa/fxbarcode/oned/BC_OnedUPCAWriter.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'xfa/fxbarcode/oned/BC_OnedUPCAWriter.h') diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h index 45d4eac620..8257dfa4b6 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h @@ -19,34 +19,33 @@ class CFX_RenderDevice; class CBC_OnedUPCAWriter : public CBC_OneDimWriter { public: CBC_OnedUPCAWriter(); - virtual ~CBC_OnedUPCAWriter(); + ~CBC_OnedUPCAWriter() override; virtual void Init(); + // CBC_OneDimWriter uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, - int32_t& e); + int32_t& e) override; uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, int32_t hints, - int32_t& e); + int32_t& e) override; uint8_t* Encode(const CFX_ByteString& contents, int32_t& outLength, - int32_t& e) { - return nullptr; - } + int32_t& e) override; void RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, - int32_t& e); - FX_BOOL CheckContentValidity(const CFX_WideStringC& contents); - CFX_WideString FilterContents(const CFX_WideStringC& contents); + int32_t& e) override; + FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) override; + CFX_WideString FilterContents(const CFX_WideStringC& contents) override; int32_t CalcChecksum(const CFX_ByteString& contents); protected: @@ -56,7 +55,7 @@ class CBC_OnedUPCAWriter : public CBC_OneDimWriter { const CFX_Matrix* matrix, int32_t barWidth, int32_t multiple, - int32_t& e); + int32_t& e) override; private: CBC_OnedEAN13Writer* m_subWriter; -- cgit v1.2.3