summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-02-23 09:25:17 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-23 14:49:18 +0000
commita0061afa12e0fec210727c9478adb8ac78c5d63c (patch)
tree340b7f1eb44ef89122fa5dc8e952e2a19c39c02f /fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
parentb147e07ee36be10ca0796a6566be107077c21a03 (diff)
downloadpdfium-a0061afa12e0fec210727c9478adb8ac78c5d63c.tar.xz
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 <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdfxfa/cpdfxfa_page.cpp')
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_page.cpp18
1 files changed, 8 insertions, 10 deletions
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<FX_FLOAT>(device_x);
- FX_FLOAT page_y_f = static_cast<FX_FLOAT>(device_y);
- device2page.TransformPoint(page_x_f, page_y_f);
+ CFX_PointF pos = device2page.Transform(CFX_PointF(
+ static_cast<FX_FLOAT>(device_x), static_cast<FX_FLOAT>(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<FX_FLOAT>(page_x);
- FX_FLOAT device_y_f = static_cast<FX_FLOAT>(page_y);
- page2device.TransformPoint(device_x_f, device_y_f);
+ CFX_PointF pos = page2device.Transform(
+ CFX_PointF(static_cast<FX_FLOAT>(page_x), static_cast<FX_FLOAT>(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,