diff options
author | Lei Zhang <thestig@chromium.org> | 2017-08-17 13:53:52 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-17 21:22:30 +0000 |
commit | 7c9d4c272c57965cb1d407a156bab1110c65e0f6 (patch) | |
tree | 1f8cb5b5f21b5f0bdcde82caf3f9a8359477d985 /xfa/fxfa/cxfa_ffimage.cpp | |
parent | ba1897b238b421e36cb34f223b8b24be2845d413 (diff) | |
download | pdfium-7c9d4c272c57965cb1d407a156bab1110c65e0f6.tar.xz |
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 <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimage.cpp')
-rw-r--r-- | xfa/fxfa/cxfa_ffimage.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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<CFX_DIBitmap> 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); } |