From c130381fd038893c1ee62a34648764d39d138b2c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 2 Nov 2017 21:14:48 +0000 Subject: Encapsulate CPDF_FormObject members. Also remove a conditional in the CPDF_Form ctor that cannot be true. Change-Id: Icd00233969cea33e9c63d0d6a9d07226c2b173f2 Reviewed-on: https://pdfium-review.googlesource.com/17070 Reviewed-by: dsinclair Commit-Queue: Lei Zhang --- core/fpdftext/cpdf_textpage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fpdftext') diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp index 82778b1658..b4f879aec5 100644 --- a/core/fpdftext/cpdf_textpage.cpp +++ b/core/fpdftext/cpdf_textpage.cpp @@ -605,12 +605,12 @@ void CPDF_TextPage::ProcessObject() { void CPDF_TextPage::ProcessFormObject(CPDF_FormObject* pFormObj, const CFX_Matrix& formMatrix) { - CPDF_PageObjectList* pObjectList = pFormObj->m_pForm->GetPageObjectList(); + const CPDF_PageObjectList* pObjectList = + pFormObj->form()->GetPageObjectList(); if (pObjectList->empty()) return; - CFX_Matrix curFormMatrix; - curFormMatrix = pFormObj->m_FormMatrix; + CFX_Matrix curFormMatrix = pFormObj->form_matrix(); curFormMatrix.Concat(formMatrix); for (auto it = pObjectList->begin(); it != pObjectList->end(); ++it) { -- cgit v1.2.3