diff options
author | Lei Zhang <thestig@chromium.org> | 2018-04-12 15:50:49 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-12 15:50:49 +0000 |
commit | c4242b24262d082f3ad70805aca779a3ff540c2c (patch) | |
tree | 5c9f666d4ae62ed728217bd8dcf3f3306905e328 /core/fpdfapi/page | |
parent | 1c23a6d78c95ff0714cda6f642420e0502edac29 (diff) | |
download | pdfium-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 'core/fpdfapi/page')
-rw-r--r-- | core/fpdfapi/page/cpdf_page.cpp | 56 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_page.h | 6 |
2 files changed, 27 insertions, 35 deletions
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp index e5d7f381a5..eb1f0b535d 100644 --- a/core/fpdfapi/page/cpdf_page.cpp +++ b/core/fpdfapi/page/cpdf_page.cpp @@ -118,11 +118,7 @@ CFX_FloatRect CPDF_Page::GetBox(const ByteString& name) const { return box; } -CFX_Matrix CPDF_Page::GetDisplayMatrix(int xPos, - int yPos, - int xSize, - int ySize, - int iRotate) const { +CFX_Matrix CPDF_Page::GetDisplayMatrix(const FX_RECT& rect, int iRotate) const { if (m_PageSize.width == 0 || m_PageSize.height == 0) return CFX_Matrix(); @@ -136,41 +132,41 @@ CFX_Matrix CPDF_Page::GetDisplayMatrix(int xPos, // This code implicitly inverts the y-axis to account for page coordinates // pointing up and bitmap coordinates pointing down. (x0, y0) is the base // point, (x1, y1) is that point translated on y and (x2, y2) is the point - // translated on x. On iRotate = 0, y0 is (yPos + ySize) and the translation + // translated on x. On iRotate = 0, y0 is rect.bottom and the translation // to get y1 is performed as negative. This results in the desired // transformation. switch (iRotate) { case 0: - x0 = xPos; - y0 = yPos + ySize; - x1 = xPos; - y1 = yPos; - x2 = xPos + xSize; - y2 = yPos + ySize; + x0 = rect.left; + y0 = rect.bottom; + x1 = rect.left; + y1 = rect.top; + x2 = rect.right; + y2 = rect.bottom; break; case 1: - x0 = xPos; - y0 = yPos; - x1 = xPos + xSize; - y1 = yPos; - x2 = xPos; - y2 = yPos + ySize; + x0 = rect.left; + y0 = rect.top; + x1 = rect.right; + y1 = rect.top; + x2 = rect.left; + y2 = rect.bottom; break; case 2: - x0 = xPos + xSize; - y0 = yPos; - x1 = xPos + xSize; - y1 = yPos + ySize; - x2 = xPos; - y2 = yPos; + x0 = rect.right; + y0 = rect.top; + x1 = rect.right; + y1 = rect.bottom; + x2 = rect.left; + y2 = rect.top; break; case 3: - x0 = xPos + xSize; - y0 = yPos + ySize; - x1 = xPos; - y1 = yPos + ySize; - x2 = xPos + xSize; - y2 = yPos; + x0 = rect.right; + y0 = rect.bottom; + x1 = rect.left; + y1 = rect.bottom; + x2 = rect.right; + y2 = rect.top; break; } CFX_Matrix matrix = m_PageMatrix; diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h index c7aa12e474..39c1b72c27 100644 --- a/core/fpdfapi/page/cpdf_page.h +++ b/core/fpdfapi/page/cpdf_page.h @@ -33,11 +33,7 @@ class CPDF_Page : public CPDF_PageObjectHolder { void ParseContent(); - CFX_Matrix GetDisplayMatrix(int xPos, - int yPos, - int xSize, - int ySize, - int iRotate) const; + CFX_Matrix GetDisplayMatrix(const FX_RECT& rect, int iRotate) const; float GetPageWidth() const { return m_PageSize.width; } float GetPageHeight() const { return m_PageSize.height; } |