From a0032a2a2c53794bbf0ccb412a5c70ce66f052fb Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 5 Oct 2018 22:18:32 +0000 Subject: Remove optional matrix parameter from CPDF_PageObject::GetBBox(). Instead, add GetTransformedBBox() with a required matrix parameter and use that when the there is a matrix. Change-Id: I594f3eb6bc7e1bc3eb6aa9f66556ebb1dfdbebe1 Reviewed-on: https://pdfium-review.googlesource.com/c/43553 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- core/fpdfapi/page/cpdf_pageobject.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/page/cpdf_pageobject.cpp') diff --git a/core/fpdfapi/page/cpdf_pageobject.cpp b/core/fpdfapi/page/cpdf_pageobject.cpp index 604309f6e6..0c3a850936 100644 --- a/core/fpdfapi/page/cpdf_pageobject.cpp +++ b/core/fpdfapi/page/cpdf_pageobject.cpp @@ -98,10 +98,10 @@ void CPDF_PageObject::TransformGeneralState(CFX_Matrix& matrix) { SetDirty(true); } -FX_RECT CPDF_PageObject::GetBBox(const CFX_Matrix* pMatrix) const { - CFX_FloatRect rect(m_Left, m_Bottom, m_Right, m_Top); - if (pMatrix) - rect = pMatrix->TransformRect(rect); +FX_RECT CPDF_PageObject::GetBBox() const { + return GetRect().GetOuterRect(); +} - return rect.GetOuterRect(); +FX_RECT CPDF_PageObject::GetTransformedBBox(const CFX_Matrix& matrix) const { + return matrix.TransformRect(GetRect()).GetOuterRect(); } -- cgit v1.2.3