From 4cb82ee95256f110489f2b503e70729c44419e74 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 22 May 2017 15:15:30 -0700 Subject: Convert more c-style pointers to CFX_UnownedPtr Change-Id: I551b4210c95db0b916e9fe6cddf11e6c3d015c50 Reviewed-on: https://pdfium-review.googlesource.com/5790 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfapi/page/cpdf_contentparser.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/page/cpdf_contentparser.cpp') diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp index eeac3c17b1..4f4036f078 100644 --- a/core/fpdfapi/page/cpdf_contentparser.cpp +++ b/core/fpdfapi/page/cpdf_contentparser.cpp @@ -98,8 +98,9 @@ void CPDF_ContentParser::Start(CPDF_Form* pForm, CPDF_Dictionary* pResources = pForm->m_pFormDict->GetDictFor("Resources"); m_pParser = pdfium::MakeUnique( - pForm->m_pDocument, pForm->m_pPageResources, pForm->m_pResources, - pParentMatrix, pForm, pResources, &form_bbox, pGraphicStates, level); + pForm->m_pDocument.Get(), pForm->m_pPageResources.Get(), + pForm->m_pResources.Get(), pParentMatrix, pForm, pResources, &form_bbox, + pGraphicStates, level); m_pParser->GetCurStates()->m_CTM = form_matrix; m_pParser->GetCurStates()->m_ParentMatrix = form_matrix; if (ClipPath.HasRef()) { @@ -114,7 +115,8 @@ void CPDF_ContentParser::Start(CPDF_Form* pForm, pState->SetSoftMask(nullptr); } m_nStreams = 0; - m_pSingleStream = pdfium::MakeRetain(pForm->m_pFormStream); + m_pSingleStream = + pdfium::MakeRetain(pForm->m_pFormStream.Get()); m_pSingleStream->LoadAllData(false); m_pData = (uint8_t*)m_pSingleStream->GetData(); m_Size = m_pSingleStream->GetSize(); @@ -167,8 +169,9 @@ void CPDF_ContentParser::Continue(IFX_Pause* pPause) { if (m_InternalStage == STAGE_PARSE) { if (!m_pParser) { m_pParser = pdfium::MakeUnique( - m_pObjectHolder->m_pDocument, m_pObjectHolder->m_pPageResources, - nullptr, nullptr, m_pObjectHolder, m_pObjectHolder->m_pResources, + m_pObjectHolder->m_pDocument.Get(), + m_pObjectHolder->m_pPageResources.Get(), nullptr, nullptr, + m_pObjectHolder.Get(), m_pObjectHolder->m_pResources.Get(), &m_pObjectHolder->m_BBox, nullptr, 0); m_pParser->GetCurStates()->m_ColorState.SetDefault(); } -- cgit v1.2.3