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/fsdk_baseform.cpp | |
| 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/fsdk_baseform.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index c86bbc8601..be20ab47ed 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -840,7 +840,7 @@ void CPDFSDK_Widget::ResetFieldAppearance(FX_BOOL bValueChanged) { } void CPDFSDK_Widget::DrawAppearance(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions) { int nFieldType = GetFieldType(); @@ -889,7 +889,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice, CPDFDoc_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv(); if (!pEnv) return; - CFX_AffineMatrix page2device; + CFX_Matrix page2device; pPageView->GetCurrentMatrix(page2device); page2device.Transform(((FX_FLOAT)rc.left), ((FX_FLOAT)rc.bottom), rcDevice.left, rcDevice.bottom); @@ -1831,8 +1831,8 @@ CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const { dsBorder); } -CPDF_Matrix CPDFSDK_Widget::GetMatrix() const { - CPDF_Matrix mt; +CFX_Matrix CPDFSDK_Widget::GetMatrix() const { + CFX_Matrix mt; CPDF_FormControl* pControl = GetFormControl(); ASSERT(pControl != NULL); @@ -1843,16 +1843,16 @@ CPDF_Matrix CPDFSDK_Widget::GetMatrix() const { switch (abs(pControl->GetRotation() % 360)) { case 0: default: - mt = CPDF_Matrix(1, 0, 0, 1, 0, 0); + mt = CFX_Matrix(1, 0, 0, 1, 0, 0); break; case 90: - mt = CPDF_Matrix(0, 1, -1, 0, fWidth, 0); + mt = CFX_Matrix(0, 1, -1, 0, fWidth, 0); break; case 180: - mt = CPDF_Matrix(-1, 0, 0, -1, fWidth, fHeight); + mt = CFX_Matrix(-1, 0, 0, -1, fWidth, fHeight); break; case 270: - mt = CPDF_Matrix(0, -1, 1, 0, 0, fHeight); + mt = CFX_Matrix(0, -1, 1, 0, 0, fHeight); break; } |