diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-03-28 21:10:35 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-28 21:10:35 +0000 |
| commit | a17a0e219d5fcd4b8714cf97e8daf119d4388bee (patch) | |
| tree | 158f81e700398e3e4fc7cb03111b79746d485fdd /core/fxge | |
| parent | cbf76e656042e3d9778ccc114983ab6a3c19ff92 (diff) | |
| download | pdfium-a17a0e219d5fcd4b8714cf97e8daf119d4388bee.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/cfx_color.cpp | 4 | ||||
| -rw-r--r-- | core/fxge/cfx_color.h | 2 | ||||
| -rw-r--r-- | core/fxge/cfx_renderdevice.h | 1 |
3 files changed, 3 insertions, 4 deletions
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 <memory> +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" |