From d3b0f7cc78e6a143e00e5eb653b3e7c918054426 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 2 May 2018 15:31:32 +0000 Subject: Remove int out params from reference to pointer in CXFA_Node. Return a CFX_Size instead. Change-Id: I3bef1093fbc887237aa69dc942f878af27b4e8e9 Reviewed-on: https://pdfium-review.googlesource.com/31911 Commit-Queue: Henrique Nakashima Reviewed-by: Ryan Harrison Reviewed-by: Lei Zhang --- xfa/fxfa/parser/cxfa_node.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_node.h') diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 32e5cfd861..b12a26ef3b 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -312,8 +312,8 @@ class CXFA_Node : public CXFA_Object { bool LoadImageImage(CXFA_FFDoc* doc); bool LoadImageEditImage(CXFA_FFDoc* doc); - void GetImageDpi(int32_t& iImageXDpi, int32_t& iImageYDpi); - void GetImageEditDpi(int32_t& iImageXDpi, int32_t& iImageYDpi); + CFX_Size GetImageDpi() const; + CFX_Size GetImageEditDpi() const; RetainPtr GetImageImage(); RetainPtr GetImageEditImage(); @@ -452,8 +452,7 @@ class CXFA_Node : public CXFA_Object { bool CalculatePushButtonAutoSize(CXFA_FFDoc* doc, CFX_SizeF* pSize); CFX_SizeF CalculateImageSize(float img_width, float img_height, - float dpi_x, - float dpi_y); + const CFX_Size& dpi); bool CalculateImageEditAutoSize(CXFA_FFDoc* doc, CFX_SizeF* pSize); bool CalculateImageAutoSize(CXFA_FFDoc* doc, CFX_SizeF* pSize); float CalculateWidgetAutoHeight(float fHeightCalc); -- cgit v1.2.3