From 8a4494034eb77bbc3453108616cc5dd67d3adbef Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 15:07:47 -0700 Subject: Change DrawAppearance() methods to take CFX_Matrix by const-ref. Change-Id: If038850c745ac26e50c313bdbe630483434caedc Reviewed-on: https://pdfium-review.googlesource.com/11390 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_annot.cpp | 4 ++-- core/fpdfdoc/cpdf_annot.h | 2 +- core/fpdfdoc/cpdf_annotlist.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index f2b54e81fe..89fd1c9740 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -360,7 +360,7 @@ CFX_ByteString CPDF_Annot::AnnotSubtypeToString(CPDF_Annot::Subtype nSubtype) { bool CPDF_Annot::DrawAppearance(CPDF_Page* pPage, CFX_RenderDevice* pDevice, - const CFX_Matrix* pUser2Device, + const CFX_Matrix& mtUser2Device, AppearanceMode mode, const CPDF_RenderOptions* pOptions) { if (!ShouldDrawAnnotation()) @@ -374,7 +374,7 @@ bool CPDF_Annot::DrawAppearance(CPDF_Page* pPage, GenerateAPIfNeeded(); CFX_Matrix matrix; - CPDF_Form* pForm = AnnotGetMatrix(pPage, this, mode, pUser2Device, &matrix); + CPDF_Form* pForm = AnnotGetMatrix(pPage, this, mode, &mtUser2Device, &matrix); if (!pForm) return false; diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index 081cef7a35..4ca1941819 100644 --- a/core/fpdfdoc/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -87,7 +87,7 @@ class CPDF_Annot { bool DrawAppearance(CPDF_Page* pPage, CFX_RenderDevice* pDevice, - const CFX_Matrix* pUser2Device, + const CFX_Matrix& mtUser2Device, AppearanceMode mode, const CPDF_RenderOptions* pOptions); bool DrawInContext(const CPDF_Page* pPage, diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index 9f6f79a02c..34c8d3a869 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -159,7 +159,7 @@ void CPDF_AnnotList::DisplayPass(CPDF_Page* pPage, } if (pContext) { pAnnot->DrawInContext(pPage, pContext, &matrix, CPDF_Annot::Normal); - } else if (!pAnnot->DrawAppearance(pPage, pDevice, &matrix, + } else if (!pAnnot->DrawAppearance(pPage, pDevice, matrix, CPDF_Annot::Normal, pOptions)) { pAnnot->DrawBorder(pDevice, &matrix, pOptions); } -- cgit v1.2.3