From 469186a47d6ac939acbd80754ed9be5c085bdc22 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 13 Jul 2017 13:39:34 -0400 Subject: Move CPWL_Utils::GetCenterSquare to CFX_FloatRect This method is working on the FloatRect content so move it to CFX_FloatRect. Change-Id: I60aabf6e3b86aa9acc59f86cff69347ec5fe5033 Reviewed-on: https://pdfium-review.googlesource.com/7712 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/pdfwindow/cpwl_utils.cpp | 17 ++--------------- fpdfsdk/pdfwindow/cpwl_utils.h | 1 - 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/cpwl_utils.cpp b/fpdfsdk/pdfwindow/cpwl_utils.cpp index 651f21e0b7..ed1a94542e 100644 --- a/fpdfsdk/pdfwindow/cpwl_utils.cpp +++ b/fpdfsdk/pdfwindow/cpwl_utils.cpp @@ -264,19 +264,6 @@ CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CFX_FloatRect& rect, return CFX_ByteString(sAppStream); } -CFX_FloatRect CPWL_Utils::GetCenterSquare(const CFX_FloatRect& rect) { - float fWidth = rect.right - rect.left; - float fHeight = rect.top - rect.bottom; - - float fCenterX = (rect.left + rect.right) / 2.0f; - float fCenterY = (rect.top + rect.bottom) / 2.0f; - - float fRadius = (fWidth > fHeight) ? fHeight / 2 : fWidth / 2; - - return CFX_FloatRect(fCenterX - fRadius, fCenterY - fRadius, - fCenterX + fRadius, fCenterY + fRadius); -} - CFX_ByteString CPWL_Utils::GetEditAppStream(CFX_Edit* pEdit, const CFX_PointF& ptOffset, const CPVT_WordRange* pRange, @@ -802,7 +789,7 @@ CFX_ByteString CPWL_Utils::GetAppStream_Star(const CFX_FloatRect& rcBBox, CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CFX_FloatRect& rcBBox, int32_t nStyle, const CPWL_Color& crText) { - CFX_FloatRect rcCenter = GetCenterSquare(rcBBox); + CFX_FloatRect rcCenter = rcBBox.GetCenterSquare(); switch (nStyle) { default: case PCS_CHECK: @@ -823,7 +810,7 @@ CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CFX_FloatRect& rcBBox, CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CFX_FloatRect& rcBBox, int32_t nStyle, const CPWL_Color& crText) { - CFX_FloatRect rcCenter = GetCenterSquare(rcBBox); + CFX_FloatRect rcCenter = rcBBox.GetCenterSquare(); switch (nStyle) { default: case PCS_CHECK: diff --git a/fpdfsdk/pdfwindow/cpwl_utils.h b/fpdfsdk/pdfwindow/cpwl_utils.h index b0caf0b386..df364c7f56 100644 --- a/fpdfsdk/pdfwindow/cpwl_utils.h +++ b/fpdfsdk/pdfwindow/cpwl_utils.h @@ -34,7 +34,6 @@ class CPWL_Utils { public: static CPVT_WordRange OverlapWordRange(const CPVT_WordRange& wr1, const CPVT_WordRange& wr2); - static CFX_FloatRect GetCenterSquare(const CFX_FloatRect& rect); static CFX_ByteString GetColorAppStream(const CPWL_Color& color, const bool& bFillOrStroke = true); -- cgit v1.2.3