diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-07-13 13:39:34 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-13 17:55:25 +0000 |
| commit | 469186a47d6ac939acbd80754ed9be5c085bdc22 (patch) | |
| tree | 759d491eb8ab13a8e41a229b53f25c7bfccc30c1 /core | |
| parent | 8db114ab60439f6d598ec68aa629f4385a532a92 (diff) | |
| download | pdfium-469186a47d6ac939acbd80754ed9be5c085bdc22.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcrt/fx_coordinates.cpp | 11 | ||||
| -rw-r--r-- | core/fxcrt/fx_coordinates.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/fxcrt/fx_coordinates.cpp b/core/fxcrt/fx_coordinates.cpp index 0b6aed44cc..752591d3ed 100644 --- a/core/fxcrt/fx_coordinates.cpp +++ b/core/fxcrt/fx_coordinates.cpp @@ -157,6 +157,17 @@ FX_RECT CFX_FloatRect::GetClosestRect() const { return rect; } +CFX_FloatRect CFX_FloatRect::GetCenterSquare() const { + float fWidth = right - left; + float fHeight = top - bottom; + float fHalfWidth = (fWidth > fHeight) ? fHeight / 2 : fWidth / 2; + + float fCenterX = (left + right) / 2.0f; + float fCenterY = (top + bottom) / 2.0f; + return CFX_FloatRect(fCenterX - fHalfWidth, fCenterY - fHalfWidth, + fCenterX + fHalfWidth, fCenterY + fHalfWidth); +} + bool CFX_FloatRect::Contains(const CFX_PointF& point) const { CFX_FloatRect n1(*this); n1.Normalize(); diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h index 25923f7290..a1bf11b207 100644 --- a/core/fxcrt/fx_coordinates.h +++ b/core/fxcrt/fx_coordinates.h @@ -482,6 +482,7 @@ class CFX_FloatRect { FX_RECT GetInnerRect() const; FX_RECT GetOuterRect() const; FX_RECT GetClosestRect() const; + CFX_FloatRect GetCenterSquare() const; int Substract4(CFX_FloatRect& substract_rect, CFX_FloatRect* pRects); |