diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
| commit | 60d909e9d4444b2b8582275624ee97734d331a38 (patch) | |
| tree | 6a884e5dd0c785c141919531033de7e2fc5b0e01 /fpdfsdk/src/fpdfxfa | |
| parent | 33c8c7602f8981c32d37a9b2e25496401e914391 (diff) | |
| download | pdfium-60d909e9d4444b2b8582275624ee97734d331a38.tar.xz | |
Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix
Review URL: https://codereview.chromium.org/1513363002 .
(cherry picked from commit f32c969bce6743fca1e7ff796b54a1692d26d7f0)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1519693002 .
Diffstat (limited to 'fpdfsdk/src/fpdfxfa')
| -rw-r--r-- | fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index 8b0db71ad0..f78eb9b27d 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp @@ -185,8 +185,8 @@ void CPDFXFA_Page::DeviceToPage(int start_x, if (!m_pPDFPage && !m_pXFAPageView)
return;
- CPDF_Matrix page2device;
- CPDF_Matrix device2page;
+ CFX_Matrix page2device;
+ CFX_Matrix device2page;
FX_FLOAT page_x_f, page_y_f;
GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
@@ -211,7 +211,7 @@ void CPDFXFA_Page::PageToDevice(int start_x, if (!m_pPDFPage && !m_pXFAPageView)
return;
- CPDF_Matrix page2device;
+ CFX_Matrix page2device;
FX_FLOAT device_x_f, device_y_f;
GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
@@ -223,7 +223,7 @@ void CPDFXFA_Page::PageToDevice(int start_x, *device_y = FXSYS_round(device_y_f);
}
-void CPDFXFA_Page::GetDisplayMatrix(CFX_AffineMatrix& matrix,
+void CPDFXFA_Page::GetDisplayMatrix(CFX_Matrix& matrix,
int xPos,
int yPos,
int xSize,
|