diff options
author | weili <weili@chromium.org> | 2016-06-13 14:57:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-13 14:57:29 -0700 |
commit | 868150bd69f0f1f9472affc20deea0a9341bf22b (patch) | |
tree | 07ebd9327583ecc20ebb43b800c2f36501a80068 /core/fpdfapi/fpdf_edit | |
parent | 82e24b1c5047076b982c073671315071760b9880 (diff) | |
download | pdfium-868150bd69f0f1f9472affc20deea0a9341bf22b.tar.xz |
Make code compile with clang_use_chrome_plugin (part I)
This change contains files in core/fpdfapi 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/2060973002
Diffstat (limited to 'core/fpdfapi/fpdf_edit')
-rw-r--r-- | core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_edit/editint.h | 3 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 6 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp index 20ae34349b..7ddc211671 100644 --- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp @@ -31,6 +31,8 @@ CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage) InsertPageObject(pObj.get()); } +CPDF_PageContentGenerator::~CPDF_PageContentGenerator() {} + FX_BOOL CPDF_PageContentGenerator::InsertPageObject( CPDF_PageObject* pPageObject) { return pPageObject && m_pageObjects.Add(pPageObject); diff --git a/core/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/fpdf_edit/editint.h index a7774050ae..cd04d5de4f 100644 --- a/core/fpdfapi/fpdf_edit/editint.h +++ b/core/fpdfapi/fpdf_edit/editint.h @@ -24,6 +24,7 @@ class CPDF_ObjectStream { }; CPDF_ObjectStream(); + ~CPDF_ObjectStream(); void Start(); FX_FILESIZE End(CPDF_Creator* pCreator); @@ -46,6 +47,7 @@ class CPDF_XRefStream { }; CPDF_XRefStream(); + ~CPDF_XRefStream(); FX_BOOL Start(); int32_t CompressIndirectObject(uint32_t dwObjNum, @@ -66,6 +68,7 @@ class CPDF_XRefStream { protected: int32_t EndObjectStream(CPDF_Creator* pCreator, FX_BOOL bEOF = TRUE); FX_BOOL GenerateXRefStream(CPDF_Creator* pCreator, FX_BOOL bEOF); + size_t m_iSeg; CPDF_ObjectStream m_ObjStream; CFX_ByteTextBuf m_Buffer; diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index 09833d82cc..c20a483764 100644 --- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -517,6 +517,8 @@ CPDF_Encryptor::~CPDF_Encryptor() { CPDF_ObjectStream::CPDF_ObjectStream() : m_dwObjNum(0), m_index(0) {} +CPDF_ObjectStream::~CPDF_ObjectStream() {} + void CPDF_ObjectStream::Start() { m_Items.clear(); m_Buffer.Clear(); @@ -603,8 +605,12 @@ FX_FILESIZE CPDF_ObjectStream::End(CPDF_Creator* pCreator) { offset += len; return ObjOffset; } + CPDF_XRefStream::CPDF_XRefStream() : m_PrevOffset(0), m_dwTempObjNum(0), m_iSeg(0) {} + +CPDF_XRefStream::~CPDF_XRefStream() {} + FX_BOOL CPDF_XRefStream::Start() { m_IndexArray.clear(); m_Buffer.Clear(); diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h index f60b083be1..adcac171a5 100644 --- a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h @@ -20,6 +20,7 @@ class CPDF_ImageObject; class CPDF_PageContentGenerator { public: explicit CPDF_PageContentGenerator(CPDF_Page* pPage); + ~CPDF_PageContentGenerator(); FX_BOOL InsertPageObject(CPDF_PageObject* pPageObject); void GenerateContent(); |