summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-04-12 15:50:49 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-12 15:50:49 +0000
commitc4242b24262d082f3ad70805aca779a3ff540c2c (patch)
tree5c9f666d4ae62ed728217bd8dcf3f3306905e328 /fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
parent1c23a6d78c95ff0714cda6f642420e0502edac29 (diff)
downloadpdfium-c4242b24262d082f3ad70805aca779a3ff540c2c.tar.xz
Change GetDisplayMatrix methods to take FX_RECT.
Change-Id: I079bc3bf1242fd28fdd51930d9deb6efa34d7509 Reviewed-on: https://pdfium-review.googlesource.com/30055 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdfxfa/cpdfxfa_page.cpp')
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_page.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index 0b4e8f60ee..a43707a9cf 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -138,7 +138,8 @@ void CPDFXFA_Page::DeviceToPage(int start_x,
if (!m_pPDFPage && !m_pXFAPageView)
return;
- CFX_PointF pos = GetDisplayMatrix(start_x, start_y, size_x, size_y, rotate)
+ const FX_RECT rect(start_x, start_y, start_x + size_x, start_y + size_y);
+ CFX_PointF pos = GetDisplayMatrix(rect, rotate)
.GetInverse()
.Transform(CFX_PointF(static_cast<float>(device_x),
static_cast<float>(device_y)));
@@ -159,8 +160,8 @@ void CPDFXFA_Page::PageToDevice(int start_x,
if (!m_pPDFPage && !m_pXFAPageView)
return;
- CFX_Matrix page2device =
- GetDisplayMatrix(start_x, start_y, size_x, size_y, rotate);
+ const FX_RECT rect(start_x, start_y, start_x + size_x, start_y + size_y);
+ CFX_Matrix page2device = GetDisplayMatrix(rect, rotate);
CFX_PointF pos = page2device.Transform(
CFX_PointF(static_cast<float>(page_x), static_cast<float>(page_y)));
@@ -169,10 +170,7 @@ void CPDFXFA_Page::PageToDevice(int start_x,
*device_y = FXSYS_round(pos.y);
}
-CFX_Matrix CPDFXFA_Page::GetDisplayMatrix(int xPos,
- int yPos,
- int xSize,
- int ySize,
+CFX_Matrix CPDFXFA_Page::GetDisplayMatrix(const FX_RECT& rect,
int iRotate) const {
if (!m_pPDFPage && !m_pXFAPageView)
return CFX_Matrix();
@@ -182,13 +180,11 @@ CFX_Matrix CPDFXFA_Page::GetDisplayMatrix(int xPos,
case FormType::kAcroForm:
case FormType::kXFAForeground:
if (m_pPDFPage)
- return m_pPDFPage->GetDisplayMatrix(xPos, yPos, xSize, ySize, iRotate);
+ return m_pPDFPage->GetDisplayMatrix(rect, iRotate);
FX_FALLTHROUGH;
case FormType::kXFAFull:
- if (m_pXFAPageView) {
- FX_RECT rect = FX_RECT(xPos, yPos, xPos + xSize, yPos + ySize);
+ if (m_pXFAPageView)
return m_pXFAPageView->GetDisplayMatrix(rect, iRotate);
- }
break;
}