From f55e72e0476e5f5699b887099f213982e207afd0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 13 Jul 2017 14:53:28 -0400 Subject: Cleanup CPDF_RenderOptions colour members. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL removes the fore/back colours in favour of just using the colours inline and converts the m_ColorMode to an enum. Change-Id: I1796e200d5c470680126af8625d45fc3062a1042 Reviewed-on: https://pdfium-review.googlesource.com/7751 Reviewed-by: Henrique Nakashima Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- core/fpdfapi/render/cpdf_renderoptions.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/render/cpdf_renderoptions.h') diff --git a/core/fpdfapi/render/cpdf_renderoptions.h b/core/fpdfapi/render/cpdf_renderoptions.h index bdcae55ad3..aa48b4e5dc 100644 --- a/core/fpdfapi/render/cpdf_renderoptions.h +++ b/core/fpdfapi/render/cpdf_renderoptions.h @@ -12,10 +12,6 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -#define RENDER_COLOR_NORMAL 0 -#define RENDER_COLOR_GRAY 1 -#define RENDER_COLOR_TWOCOLOR 2 -#define RENDER_COLOR_ALPHA 3 #define RENDER_CLEARTYPE 0x00000001 #define RENDER_PRINTGRAPHICTEXT 0x00000002 #define RENDER_FORCE_DOWNSAMPLE 0x00000004 @@ -36,15 +32,15 @@ class CPDF_RenderOptions { public: + enum Type { kNormal = 0, kGray, kAlpha }; + CPDF_RenderOptions(); CPDF_RenderOptions(const CPDF_RenderOptions& rhs); ~CPDF_RenderOptions(); FX_ARGB TranslateColor(FX_ARGB argb) const; - int m_ColorMode; - FX_COLORREF m_BackColor; - FX_COLORREF m_ForeColor; + Type m_ColorMode; uint32_t m_Flags; uint32_t m_dwLimitCacheSize; bool m_bDrawAnnots; -- cgit v1.2.3