diff options
author | weili <weili@chromium.org> | 2016-06-14 18:20:04 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-14 18:20:04 -0700 |
commit | 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 (patch) | |
tree | d40c21b3396ad28de29640fcf759ca678203910f /xfa/fxbarcode/oned/BC_OneDimWriter.h | |
parent | f4bb580add3824196dc49cd7de2f7d051019ede8 (diff) | |
download | pdfium-29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467.tar.xz |
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
Diffstat (limited to 'xfa/fxbarcode/oned/BC_OneDimWriter.h')
-rw-r--r-- | xfa/fxbarcode/oned/BC_OneDimWriter.h | 67 |
1 files changed, 30 insertions, 37 deletions
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index a0a076217a..10eccf9eea 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h @@ -18,24 +18,22 @@ class CFX_RenderDevice; class CBC_OneDimWriter : public CBC_Writer { public: CBC_OneDimWriter(); - virtual ~CBC_OneDimWriter(); + ~CBC_OneDimWriter() override; - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e); + virtual uint8_t* Encode(const CFX_ByteString& contents, + BCFORMAT format, + int32_t& outWidth, + int32_t& outHeight, + int32_t& e); + virtual uint8_t* Encode(const CFX_ByteString& contents, + BCFORMAT format, + int32_t& outWidth, + int32_t& outHeight, + int32_t hints, + int32_t& e); virtual uint8_t* Encode(const CFX_ByteString& contents, int32_t& outLength, - int32_t& e) { - return nullptr; - } + int32_t& e); virtual void RenderResult(const CFX_WideStringC& contents, uint8_t* code, @@ -49,30 +47,24 @@ class CBC_OneDimWriter : public CBC_Writer { const CFX_Matrix* matrix, const CFX_WideStringC& contents, int32_t& e); - virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) { - return TRUE; - } - virtual CFX_WideString FilterContents(const CFX_WideStringC& contents) { - return CFX_WideString(); - } - virtual CFX_WideString RenderTextContents(const CFX_WideStringC& contents) { - return CFX_WideString(); - } + virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents); + virtual CFX_WideString FilterContents(const CFX_WideStringC& contents); + virtual CFX_WideString RenderTextContents(const CFX_WideStringC& contents); virtual void SetPrintChecksum(FX_BOOL checksum); virtual void SetDataLength(int32_t length); virtual void SetCalcChecksum(int32_t state); virtual void SetFontSize(FX_FLOAT size); virtual void SetFontStyle(int32_t style); virtual void SetFontColor(FX_ARGB color); - virtual FX_BOOL SetFont(CFX_Font* cFont); + FX_BOOL SetFont(CFX_Font* cFont); protected: - void CalcTextInfo(const CFX_ByteString& text, - FXTEXT_CHARPOS* charPos, - CFX_Font* cFont, - FX_FLOAT geWidth, - int32_t fontSize, - FX_FLOAT& charsLen); + virtual void CalcTextInfo(const CFX_ByteString& text, + FXTEXT_CHARPOS* charPos, + CFX_Font* cFont, + FX_FLOAT geWidth, + int32_t fontSize, + FX_FLOAT& charsLen); virtual void ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap* pOutBitmap, CFX_RenderDevice* device, @@ -95,12 +87,13 @@ class CBC_OneDimWriter : public CBC_Writer { FX_FLOAT locX, FX_FLOAT locY, int32_t barWidth); - int32_t AppendPattern(uint8_t* target, - int32_t pos, - const int32_t* pattern, - int32_t patternLength, - int32_t startColor, - int32_t& e); + virtual int32_t AppendPattern(uint8_t* target, + int32_t pos, + const int32_t* pattern, + int32_t patternLength, + int32_t startColor, + int32_t& e); + FX_WCHAR Upper(FX_WCHAR ch); FX_BOOL m_bPrintChecksum; |