From 7c9d4c272c57965cb1d407a156bab1110c65e0f6 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 13:53:52 -0700 Subject: Change CXFA_FFWidget::RenderWidget() to take a const CFX_Matrix&. Change some related code to take a const CFX_Matrix* since it is not immediately obvious if the matrix can be made into a const-ref. Change-Id: I15c840222b575cc479b1f6f0b6d3b3c0e50d5515 Reviewed-on: https://pdfium-review.googlesource.com/11113 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- xfa/fxfa/cxfa_ffimage.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_ffimage.cpp') diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp index 75f8c3609b..ec6a29cd28 100644 --- a/xfa/fxfa/cxfa_ffimage.cpp +++ b/xfa/fxfa/cxfa_ffimage.cpp @@ -35,16 +35,15 @@ void CXFA_FFImage::UnloadWidget() { } void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, - CFX_Matrix* pMatrix, + const CFX_Matrix& matrix, uint32_t dwStatus) { if (!IsMatchVisibleStatus(dwStatus)) return; CFX_Matrix mtRotate = GetRotateMatrix(); - if (pMatrix) - mtRotate.Concat(*pMatrix); + mtRotate.Concat(matrix); - CXFA_FFWidget::RenderWidget(pGS, &mtRotate, dwStatus); + CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus); CFX_RetainPtr pDIBitmap = GetDataAcc()->GetImageImage(); if (!pDIBitmap) @@ -67,6 +66,6 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, int32_t iImageXDpi = 0; int32_t iImageYDpi = 0; m_pDataAcc->GetImageDpi(iImageXDpi, iImageYDpi); - XFA_DrawImage(pGS, rtImage, &mtRotate, pDIBitmap, iAspect, iImageXDpi, + XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, iAspect, iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign); } -- cgit v1.2.3