From ac91f6b598f5e0373176e6e9b860c1e135fddf65 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 2 May 2018 16:28:22 +0000 Subject: Pass DPI as CFX_Size in XFA_DrawImage. Change-Id: Ifbcb727402c1c28a6e8abe02511d6da6828c02f7 Reviewed-on: https://pdfium-review.googlesource.com/31915 Commit-Queue: Henrique Nakashima Reviewed-by: Lei Zhang Reviewed-by: Ryan Harrison --- xfa/fxfa/cxfa_ffwidget.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/cxfa_ffwidget.cpp') diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 553612ea87..96c611e3f7 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -74,8 +74,7 @@ void XFA_DrawImage(CXFA_Graphics* pGS, const CFX_Matrix& matrix, const RetainPtr& pDIBitmap, XFA_AttributeEnum iAspect, - int32_t iImageXDpi, - int32_t iImageYDpi, + const CFX_Size& dpi, XFA_AttributeEnum iHorzAlign, XFA_AttributeEnum iVertAlign) { if (rtImage.IsEmpty()) @@ -83,10 +82,9 @@ void XFA_DrawImage(CXFA_Graphics* pGS, if (!pDIBitmap || !pDIBitmap->GetBuffer()) return; - CFX_RectF rtFit( - rtImage.TopLeft(), - XFA_UnitPx2Pt((float)pDIBitmap->GetWidth(), (float)iImageXDpi), - XFA_UnitPx2Pt((float)pDIBitmap->GetHeight(), (float)iImageYDpi)); + CFX_RectF rtFit(rtImage.TopLeft(), + XFA_UnitPx2Pt(pDIBitmap->GetWidth(), dpi.width), + XFA_UnitPx2Pt(pDIBitmap->GetHeight(), dpi.height)); switch (iAspect) { case XFA_AttributeEnum::Fit: { float f1 = rtImage.height / rtFit.height; -- cgit v1.2.3