From e5c0fa97c2da104426dbc1cecfc0ed488a22efe5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 8 May 2018 00:00:16 +0000 Subject: Make one more CPDF_PageObjectHolder member protected. Change-Id: Id9288d504f063759f69632ab59b0a21569ff76d8 Reviewed-on: https://pdfium-review.googlesource.com/32113 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- core/fpdfapi/page/cpdf_contentparser.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 dcdf138779..f558ac823a 100644 --- a/core/fpdfapi/page/cpdf_contentparser.cpp +++ b/core/fpdfapi/page/cpdf_contentparser.cpp @@ -24,12 +24,12 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Page* pPage) : m_InternalStage(STAGE_GETCONTENT), m_pObjectHolder(pPage) { - if (!pPage || !pPage->GetDocument() || !pPage->m_pFormDict) { + if (!pPage || !pPage->GetDocument() || !pPage->GetFormDict()) { m_bIsDone = true; return; } - CPDF_Object* pContent = pPage->m_pFormDict->GetDirectObjectFor("Contents"); + CPDF_Object* pContent = pPage->GetFormDict()->GetDirectObjectFor("Contents"); if (!pContent) { m_bIsDone = true; return; @@ -61,11 +61,11 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm, : m_InternalStage(STAGE_PARSE), m_pObjectHolder(pForm), m_pType3Char(pType3Char) { - CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrixFor("Matrix"); + CFX_Matrix form_matrix = pForm->GetFormDict()->GetMatrixFor("Matrix"); if (pGraphicStates) form_matrix.Concat(pGraphicStates->m_CTM); - CPDF_Array* pBBox = pForm->m_pFormDict->GetArrayFor("BBox"); + CPDF_Array* pBBox = pForm->GetFormDict()->GetArrayFor("BBox"); CFX_FloatRect form_bbox; CPDF_Path ClipPath; if (pBBox) { @@ -82,7 +82,7 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm, form_bbox = pParentMatrix->TransformRect(form_bbox); } - CPDF_Dictionary* pResources = pForm->m_pFormDict->GetDictFor("Resources"); + CPDF_Dictionary* pResources = pForm->GetFormDict()->GetDictFor("Resources"); m_pParser = pdfium::MakeUnique( pForm->GetDocument(), pForm->m_pPageResources.Get(), pForm->m_pResources.Get(), pParentMatrix, pForm, pResources, form_bbox, @@ -144,7 +144,7 @@ bool CPDF_ContentParser::Continue(PauseIndicatorIface* pPause) { m_CurrentOffset = 0; } else { CPDF_Array* pContent = - m_pObjectHolder->m_pFormDict->GetArrayFor("Contents"); + m_pObjectHolder->GetFormDict()->GetArrayFor("Contents"); CPDF_Stream* pStreamObj = ToStream( pContent ? pContent->GetDirectObjectAt(m_CurrentOffset) : nullptr); m_StreamArray[m_CurrentOffset] = -- cgit v1.2.3