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.cpp | 31 ++++-------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'core/fpdfapi/render/cpdf_renderoptions.cpp') diff --git a/core/fpdfapi/render/cpdf_renderoptions.cpp b/core/fpdfapi/render/cpdf_renderoptions.cpp index b452405c3d..7916243cba 100644 --- a/core/fpdfapi/render/cpdf_renderoptions.cpp +++ b/core/fpdfapi/render/cpdf_renderoptions.cpp @@ -7,15 +7,13 @@ #include "core/fpdfapi/render/cpdf_renderoptions.h" CPDF_RenderOptions::CPDF_RenderOptions() - : m_ColorMode(RENDER_COLOR_NORMAL), + : m_ColorMode(kNormal), m_Flags(RENDER_CLEARTYPE), m_dwLimitCacheSize(1024 * 1024 * 100), m_bDrawAnnots(false) {} CPDF_RenderOptions::CPDF_RenderOptions(const CPDF_RenderOptions& rhs) : m_ColorMode(rhs.m_ColorMode), - m_BackColor(rhs.m_BackColor), - m_ForeColor(rhs.m_ForeColor), m_Flags(rhs.m_Flags), m_dwLimitCacheSize(rhs.m_dwLimitCacheSize), m_bDrawAnnots(rhs.m_bDrawAnnots), @@ -24,10 +22,9 @@ CPDF_RenderOptions::CPDF_RenderOptions(const CPDF_RenderOptions& rhs) CPDF_RenderOptions::~CPDF_RenderOptions() {} FX_ARGB CPDF_RenderOptions::TranslateColor(FX_ARGB argb) const { - if (m_ColorMode == RENDER_COLOR_NORMAL) + if (m_ColorMode == kNormal) return argb; - - if (m_ColorMode == RENDER_COLOR_ALPHA) + if (m_ColorMode == kAlpha) return argb; int a; @@ -36,25 +33,5 @@ FX_ARGB CPDF_RenderOptions::TranslateColor(FX_ARGB argb) const { int b; std::tie(a, r, g, b) = ArgbDecode(argb); int gray = FXRGB2GRAY(r, g, b); - if (m_ColorMode == RENDER_COLOR_TWOCOLOR) { - int color = (r - gray) * (r - gray) + (g - gray) * (g - gray) + - (b - gray) * (b - gray); - if (gray < 35 && color < 20) - return ArgbEncode(a, m_ForeColor); - - if (gray > 221 && color < 20) - return ArgbEncode(a, m_BackColor); - - return argb; - } - int fr = FXSYS_GetRValue(m_ForeColor); - int fg = FXSYS_GetGValue(m_ForeColor); - int fb = FXSYS_GetBValue(m_ForeColor); - int br = FXSYS_GetRValue(m_BackColor); - int bg = FXSYS_GetGValue(m_BackColor); - int bb = FXSYS_GetBValue(m_BackColor); - r = (br - fr) * gray / 255 + fr; - g = (bg - fg) * gray / 255 + fg; - b = (bb - fb) * gray / 255 + fb; - return ArgbEncode(a, r, g, b); + return ArgbEncode(a, gray, gray, gray); } -- cgit v1.2.3