From f4f2b6d45e00c67a3c508618a829330a67b827ba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 24 Oct 2018 18:30:30 +0000 Subject: Start making CPDF_PathObject members private. Also move member initialization to the header. Change-Id: I557380ae774ddf887cefeb56df2a33e5b7cff8a4 Reviewed-on: https://pdfium-review.googlesource.com/c/44510 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- core/fpdfapi/render/cpdf_renderstatus.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fpdfapi/render/cpdf_renderstatus.cpp') diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 6943661cf3..6b17e09642 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1251,7 +1251,7 @@ bool CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, uint32_t fill_argb = FillType ? GetFillArgb(pPathObj) : 0; uint32_t stroke_argb = bStroke ? GetStrokeArgb(pPathObj) : 0; - CFX_Matrix path_matrix = pPathObj->m_Matrix; + CFX_Matrix path_matrix = pPathObj->matrix(); path_matrix.Concat(mtObj2Device); if (!IsAvailableMatrix(path_matrix)) return true; @@ -1415,7 +1415,7 @@ bool CPDF_RenderStatus::ClipPattern(const CPDF_PageObject* pPageObj, bool CPDF_RenderStatus::SelectClipPath(const CPDF_PathObject* pPathObj, const CFX_Matrix& mtObj2Device, bool bStroke) { - CFX_Matrix path_matrix = pPathObj->m_Matrix; + CFX_Matrix path_matrix = pPathObj->matrix(); path_matrix.Concat(mtObj2Device); if (bStroke) { CFX_GraphState graphState = pPathObj->m_GraphState; @@ -2007,9 +2007,9 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_Origin.x, charpos.m_Origin.y)); path.m_Path.Append(pPath, &matrix); - path.m_Matrix = *pTextMatrix; path.m_bStroke = bStroke; path.m_FillType = bFill ? FXFILL_WINDING : 0; + path.set_matrix(*pTextMatrix); path.CalcBoundingBox(); ProcessPath(&path, mtObj2Device); } -- cgit v1.2.3