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/fxge/cfx_color.cpp | 4 +--- core/fxge/cfx_color.h | 2 +- core/fxge/cfx_renderdevice.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/cfx_color.cpp b/core/fxge/cfx_color.cpp index 5175adc50a..8a2f42d920 100644 --- a/core/fxge/cfx_color.cpp +++ b/core/fxge/cfx_color.cpp @@ -87,10 +87,8 @@ CFX_Color CFX_Color::ParseColor(const ByteString& str) { CPDF_DefaultAppearance appearance(str); ASSERT(appearance.HasColor()); - int color_type; float values[4]; - appearance.GetColor(color_type, values); - + int color_type = appearance.GetColor(values); if (color_type == CFX_Color::kTransparent) return CFX_Color(CFX_Color::kTransparent); if (color_type == CFX_Color::kGray) diff --git a/core/fxge/cfx_color.h b/core/fxge/cfx_color.h index 099e19b11e..aaa533cacb 100644 --- a/core/fxge/cfx_color.h +++ b/core/fxge/cfx_color.h @@ -7,7 +7,7 @@ #ifndef CORE_FXGE_CFX_COLOR_H_ #define CORE_FXGE_CFX_COLOR_H_ -#include "core/fpdfdoc/cpdf_formcontrol.h" +#include "core/fpdfapi/parser/cpdf_array.h" #include "core/fxge/fx_dib.h" struct CFX_Color { diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index 0eafe8c018..757dfdf17f 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -9,6 +9,7 @@ #include +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" -- cgit v1.2.3