From 74b8c6ed314cfcc83aea13f028b4231db26e6ff8 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 12 Oct 2016 09:38:41 -0700 Subject: Get rid of CFX_ArrayTemplate They won't work with std::unique_ptr down the road, so replace with std::vector. Review-Url: https://codereview.chromium.org/2411703003 --- core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp') 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) -- cgit v1.2.3