summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_ffimageedit.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-08-17 13:53:52 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-08-17 21:22:30 +0000
commit7c9d4c272c57965cb1d407a156bab1110c65e0f6 (patch)
tree1f8cb5b5f21b5f0bdcde82caf3f9a8359477d985 /xfa/fxfa/cxfa_ffimageedit.cpp
parentba1897b238b421e36cb34f223b8b24be2845d413 (diff)
downloadpdfium-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_ffimageedit.cpp')
-rw-r--r--xfa/fxfa/cxfa_ffimageedit.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 02eeb98d84..bc5678ac90 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -52,16 +52,15 @@ void CXFA_FFImageEdit::UnloadWidget() {
}
void CXFA_FFImageEdit::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);
CXFA_Border borderUI = m_pDataAcc->GetUIBorder();
DrawBorder(pGS, borderUI, m_rtUI, &mtRotate);
RenderCaption(pGS, &mtRotate);
@@ -86,7 +85,7 @@ void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS,
int32_t iImageXDpi = 0;
int32_t iImageYDpi = 0;
m_pDataAcc->GetImageEditDpi(iImageXDpi, iImageYDpi);
- XFA_DrawImage(pGS, rtImage, &mtRotate, pDIBitmap, iAspect, iImageXDpi,
+ XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, iAspect, iImageXDpi,
iImageYDpi, iHorzAlign, iVertAlign);
}