From a0061afa12e0fec210727c9478adb8ac78c5d63c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 23 Feb 2017 09:25:17 -0500 Subject: Convert TransformPoint calls to Transform calls This Cl converts remaining calls to TransformPoint to use Transform instead. Change-Id: I7a2c000492da5dda3975b4449812f281816fdab6 Reviewed-on: https://pdfium-review.googlesource.com/2822 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/fpdfxfa/cpdfxfa_page.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp index b708a361e5..8b5bb3d279 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp @@ -158,12 +158,11 @@ void CPDFXFA_Page::DeviceToPage(int start_x, device2page.SetReverse( GetDisplayMatrix(start_x, start_y, size_x, size_y, rotate)); - FX_FLOAT page_x_f = static_cast(device_x); - FX_FLOAT page_y_f = static_cast(device_y); - device2page.TransformPoint(page_x_f, page_y_f); + CFX_PointF pos = device2page.Transform(CFX_PointF( + static_cast(device_x), static_cast(device_y))); - *page_x = page_x_f; - *page_y = page_y_f; + *page_x = pos.x; + *page_y = pos.y; } void CPDFXFA_Page::PageToDevice(int start_x, @@ -181,12 +180,11 @@ void CPDFXFA_Page::PageToDevice(int start_x, CFX_Matrix page2device = GetDisplayMatrix(start_x, start_y, size_x, size_y, rotate); - FX_FLOAT device_x_f = static_cast(page_x); - FX_FLOAT device_y_f = static_cast(page_y); - page2device.TransformPoint(device_x_f, device_y_f); + CFX_PointF pos = page2device.Transform( + CFX_PointF(static_cast(page_x), static_cast(page_y))); - *device_x = FXSYS_round(device_x_f); - *device_y = FXSYS_round(device_y_f); + *device_x = FXSYS_round(pos.x); + *device_y = FXSYS_round(pos.y); } CFX_Matrix CPDFXFA_Page::GetDisplayMatrix(int xPos, -- cgit v1.2.3