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_baseannot.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_baseannot.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseannot.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index c2036a5ba8..82bbeb11ac 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -564,7 +564,7 @@ CFX_ByteString CPDFSDK_BAAnnot::GetSubType() const { } void CPDFSDK_BAAnnot::DrawAppearance(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions) { ASSERT(m_pPageView != NULL); @@ -601,7 +601,7 @@ FX_BOOL CPDFSDK_BAAnnot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode) { } void CPDFSDK_BAAnnot::DrawBorder(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, const CPDF_RenderOptions* pOptions) { ASSERT(m_pAnnot != NULL); m_pAnnot->DrawBorder(pDevice, pUser2Device, pOptions); @@ -849,7 +849,7 @@ FX_BOOL CPDFSDK_BAAnnot::GetColor(FX_COLORREF& color) const { void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Rect& rcBBox, - const CPDF_Matrix& matrix, + const CFX_Matrix& matrix, const CFX_ByteString& sContents, const CFX_ByteString& sAPState) { CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP"); @@ -977,7 +977,7 @@ FX_BOOL CPDFSDK_BAAnnot::IsXFAField() { #endif // PDF_ENABLE_XFA void CPDFSDK_BAAnnot::Annot_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) { m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal); m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device, |