diff options
author | tsepez <tsepez@chromium.org> | 2016-10-12 09:38:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-12 09:38:41 -0700 |
commit | 74b8c6ed314cfcc83aea13f028b4231db26e6ff8 (patch) | |
tree | e417f5d3ec4286aa9709354d9418f06eb1b8887b /core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp | |
parent | 47cbc06ef6f528e4d30a869ec533d010ee79b064 (diff) | |
download | pdfium-74b8c6ed314cfcc83aea13f028b4231db26e6ff8.tar.xz |
Get rid of CFX_ArrayTemplate<CPDF_Object*>
They won't work with std::unique_ptr down the road, so replace
with std::vector.
Review-Url: https://codereview.chromium.org/2411703003
Diffstat (limited to 'core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp')
-rw-r--r-- | core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp index 66a47406f5..ad1ffaf687 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp @@ -34,21 +34,19 @@ CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage) CPDF_PageContentGenerator::~CPDF_PageContentGenerator() {} -FX_BOOL CPDF_PageContentGenerator::InsertPageObject( - CPDF_PageObject* pPageObject) { - return pPageObject && m_pageObjects.Add(pPageObject); +void CPDF_PageContentGenerator::InsertPageObject(CPDF_PageObject* pPageObject) { + if (pPageObject) + m_pageObjects.push_back(pPageObject); } void CPDF_PageContentGenerator::GenerateContent() { CFX_ByteTextBuf buf; - CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict; - for (int i = 0; i < m_pageObjects.GetSize(); ++i) { - CPDF_PageObject* pPageObj = m_pageObjects[i]; - if (!pPageObj || !pPageObj->IsImage()) { - continue; - } - ProcessImage(buf, pPageObj->AsImage()); + for (CPDF_PageObject* pPageObj : m_pageObjects) { + CPDF_ImageObject* pImageObject = pPageObj->AsImage(); + if (pImageObject) + ProcessImage(buf, pImageObject); } + CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict; CPDF_Object* pContent = pPageDict ? pPageDict->GetDirectObjectFor("Contents") : nullptr; if (pContent) |