From a17a0e219d5fcd4b8714cf97e8daf119d4388bee Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 28 Mar 2018 21:10:35 +0000 Subject: Remove CPDF_DefaultAppearance reference params This CL converts the CPDF_DefaultAppearance::GetColor methods to return instead of using reference parameters. Change-Id: I9ba6bf060a536290a83d3c9ce6e115511f28664c Reviewed-on: https://pdfium-review.googlesource.com/29410 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima --- core/fpdfdoc/cpdf_defaultappearance.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/fpdfdoc/cpdf_defaultappearance.h') diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h index 79ad0bb526..79578930e1 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.h +++ b/core/fpdfdoc/cpdf_defaultappearance.h @@ -7,11 +7,13 @@ #ifndef CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ #define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ +#include + #include "core/fpdfapi/parser/cpdf_simple_parser.h" -#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE }; @@ -27,8 +29,8 @@ class CPDF_DefaultAppearance { ByteString GetFont(float* fFontSize); bool HasColor(); - void GetColor(int& iColorType, float fc[4]); - void GetColor(FX_ARGB& color, int& iColorType); + CFX_Color::Type GetColor(float fc[4]); + std::pair GetColor(); bool FindTagParamFromStartForTesting(CPDF_SimpleParser* parser, const ByteStringView& token, -- cgit v1.2.3