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/datamatrix/BC_DataMatrixVersion.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/datamatrix/BC_DataMatrixVersion.h')
-rw-r--r-- | xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h index b4585d20bc..9bbf7f7b72 100644 --- a/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h +++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixVersion.h @@ -13,8 +13,7 @@ class CBC_DataMatrixVersion; class ECB { public: - ECB(int32_t count, int32_t dataCodewords) - : m_count(count), m_dataCodewords(dataCodewords) {} + ECB(int32_t count, int32_t dataCodewords); int32_t GetCount() const { return m_count; } int32_t GetDataCodewords() const { return m_dataCodewords; } @@ -26,20 +25,9 @@ class ECB { class ECBlocks { public: - ECBlocks(int32_t ecCodewords, ECB* ecBlocks) : m_ecCodewords(ecCodewords) { - m_ecBlocksArray.Add(ecBlocks); - } - - ECBlocks(int32_t ecCodewords, ECB* ecBlocks1, ECB* ecBlocks2) - : m_ecCodewords(ecCodewords) { - m_ecBlocksArray.Add(ecBlocks1); - m_ecBlocksArray.Add(ecBlocks2); - } - - ~ECBlocks() { - for (int32_t i = 0; i < m_ecBlocksArray.GetSize(); i++) - delete m_ecBlocksArray[i]; - } + ECBlocks(int32_t ecCodewords, ECB* ecBlocks); + ECBlocks(int32_t ecCodewords, ECB* ecBlocks1, ECB* ecBlocks2); + ~ECBlocks(); int32_t GetECCodewords() { return m_ecCodewords; } const CFX_ArrayTemplate<ECB*>& GetECBlocks() { return m_ecBlocksArray; } @@ -58,6 +46,7 @@ class CBC_DataMatrixVersion { int32_t dataRegionSizeColumns, ECBlocks* ecBlocks); virtual ~CBC_DataMatrixVersion(); + static void Initialize(); static void Finalize(); int32_t GetVersionNumber(); |