diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-21 12:56:24 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-21 19:05:18 +0000 |
| commit | 1f403cee9478021862c7cc4e516907bd51e8f0f6 (patch) | |
| tree | 57829fa3b036ee9ddd57a8ad5b3541fe4e96fdb8 /fpdfsdk/pdfwindow/PWL_Wnd.cpp | |
| parent | 04557b8a7c2d3dab06fe9eadacc3c7744b3e14e2 (diff) | |
| download | pdfium-1f403cee9478021862c7cc4e516907bd51e8f0f6.tar.xz | |
Convert more TransformPoint calls to Transform
This Cl converts several uses of TransformPoint to use Transform(CFX_PointF).
Change-Id: I9bc3c484e0a4304b904584218bd9e59dec7db727
Reviewed-on: https://pdfium-review.googlesource.com/2791
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Wnd.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Wnd.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp index cf573220b7..341ae7448f 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp +++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp @@ -849,14 +849,6 @@ CFX_Matrix CPWL_Wnd::GetWindowMatrix() const { return mt; } -void CPWL_Wnd::PWLtoWnd(const CFX_PointF& point, int32_t& x, int32_t& y) const { - CFX_Matrix mt = GetWindowMatrix(); - CFX_PointF pt = point; - mt.TransformPoint(pt.x, pt.y); - x = (int32_t)(pt.x + 0.5); - y = (int32_t)(pt.y + 0.5); -} - FX_RECT CPWL_Wnd::PWLtoWnd(const CFX_FloatRect& rect) const { CFX_FloatRect rcTemp = rect; CFX_Matrix mt = GetWindowMatrix(); @@ -867,12 +859,7 @@ FX_RECT CPWL_Wnd::PWLtoWnd(const CFX_FloatRect& rect) const { CFX_PointF CPWL_Wnd::ChildToParent(const CFX_PointF& point) const { CFX_Matrix mt = GetChildMatrix(); - if (mt.IsIdentity()) - return point; - - CFX_PointF pt = point; - mt.TransformPoint(pt.x, pt.y); - return pt; + return mt.IsIdentity() ? point : mt.Transform(point); } CFX_FloatRect CPWL_Wnd::ChildToParent(const CFX_FloatRect& rect) const { @@ -891,9 +878,7 @@ CFX_PointF CPWL_Wnd::ParentToChild(const CFX_PointF& point) const { return point; mt.SetReverse(mt); - CFX_PointF pt = point; - mt.TransformPoint(pt.x, pt.y); - return pt; + return mt.Transform(point); } CFX_FloatRect CPWL_Wnd::ParentToChild(const CFX_FloatRect& rect) const { |