From 98d1b48e9a3471a02968f3d12692645fa0fcb50d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 24 Oct 2018 23:53:03 +0000 Subject: Clean up CFX_ImageTransformer parameters. - A valid matrix is always passed in, so make the parameter const-ref. Since it is not obvious who owns the passed in matrix, make a copy with the corresponding matrix member. - Since the matrix parameter is const-ref, CFX_DIBBase::TransformTo() can also have a const-ref matrix parameter. - |flags| should be uint32_t, since |m_Flags| is. - |pClips| is only used inside the ctor, so remove |m_pClip|. Change-Id: If3d58a3fd28fa72b4ac7caac15f49a8057c594db Reviewed-on: https://pdfium-review.googlesource.com/c/44541 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- xfa/fxfa/cxfa_imagerenderer.cpp | 2 +- xfa/fxgraphics/cxfa_graphics.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/cxfa_imagerenderer.cpp b/xfa/fxfa/cxfa_imagerenderer.cpp index 9f65eaa07c..5f90b3cff6 100644 --- a/xfa/fxfa/cxfa_imagerenderer.cpp +++ b/xfa/fxfa/cxfa_imagerenderer.cpp @@ -49,7 +49,7 @@ bool CXFA_ImageRenderer::Start() { clip_box.Intersect(image_rect); m_Status = 2; m_pTransformer = pdfium::MakeUnique( - pDib, &m_ImageMatrix, FXDIB_INTERPOL, &clip_box); + pDib, m_ImageMatrix, FXDIB_INTERPOL, &clip_box); return true; } if (m_ImageMatrix.a < 0) diff --git a/xfa/fxgraphics/cxfa_graphics.cpp b/xfa/fxgraphics/cxfa_graphics.cpp index 03689da618..32499271b6 100644 --- a/xfa/fxgraphics/cxfa_graphics.cpp +++ b/xfa/fxgraphics/cxfa_graphics.cpp @@ -423,7 +423,7 @@ void CXFA_Graphics::SetDIBitsWithMatrix(const RetainPtr& source, int32_t left; int32_t top; RetainPtr bmp1 = source->FlipImage(false, true); - RetainPtr bmp2 = bmp1->TransformTo(&m, &left, &top); + RetainPtr bmp2 = bmp1->TransformTo(m, &left, &top); m_renderDevice->SetDIBits(bmp2, left, top); } } -- cgit v1.2.3