From 0cc77c9ef74f527a6887d9a2e8ebcb6412615f30 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 7 May 2018 22:55:46 +0000 Subject: Add some getters for CPDF_PageObjectHolder. Change-Id: I3fe99ecb17d37f893ce5d0d59219c82ee31fe7ea Reviewed-on: https://pdfium-review.googlesource.com/32110 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_annot.cpp | 4 ++-- core/fpdfdoc/cpdf_annotlist.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index ef803c428d..3b84baf8db 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -53,9 +53,9 @@ CPDF_Form* AnnotGetMatrix(const CPDF_Page* pPage, if (!pForm) return nullptr; - CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrixFor("Matrix"); + CFX_Matrix form_matrix = pForm->GetFormDict()->GetMatrixFor("Matrix"); CFX_FloatRect form_bbox = - form_matrix.TransformRect(pForm->m_pFormDict->GetRectFor("BBox")); + form_matrix.TransformRect(pForm->GetFormDict()->GetRectFor("BBox")); matrix->MatchRect(pAnnot->GetRect(), form_bbox); matrix->Concat(*pUser2Device); return pForm; diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index 6b359f1eb5..77a2d0c2af 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -120,11 +120,11 @@ void GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict) { } // namespace CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) - : m_pDocument(pPage->m_pDocument.Get()) { - if (!pPage->m_pFormDict) + : m_pDocument(pPage->GetDocument()) { + if (!pPage->GetFormDict()) return; - CPDF_Array* pAnnots = pPage->m_pFormDict->GetArrayFor("Annots"); + CPDF_Array* pAnnots = pPage->GetFormDict()->GetArrayFor("Annots"); if (!pAnnots) return; -- cgit v1.2.3