From 073b99d51c7a964e5b97278f88ed9ebe917b62d3 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Fri, 9 Mar 2018 22:54:11 +0000 Subject: Cleanup CPDF_DefaultAppearance Minor cleanups and refactoring of the CPDF_DefaultAppearance class. Change-Id: I7b3de021e8a6a1e9ca1d70ae413f3c433627f3fd Reviewed-on: https://pdfium-review.googlesource.com/28390 Commit-Queue: Ryan Harrison Reviewed-by: Ryan Harrison --- core/fpdfdoc/cpdf_defaultappearance.cpp | 42 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'core/fpdfdoc/cpdf_defaultappearance.cpp') diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp index 4542c59a7d..ba0679a19a 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.cpp +++ b/core/fpdfdoc/cpdf_defaultappearance.cpp @@ -79,35 +79,29 @@ void CPDF_DefaultAppearance::GetColor(int& iColorType, float fc[4]) { void CPDF_DefaultAppearance::GetColor(FX_ARGB& color, int& iColorType) { color = 0; - iColorType = CFX_Color::kTransparent; - if (m_csDA.IsEmpty()) + float values[4]; + GetColor(iColorType, values); + if (iColorType == CFX_Color::kTransparent) return; - CPDF_SimpleParser syntax(m_csDA.AsStringView()); - if (syntax.FindTagParamFromStart("g", 1)) { - iColorType = CFX_Color::kGray; - float g = FX_atof(syntax.GetWord()) * 255 + 0.5f; - color = ArgbEncode(255, (int)g, (int)g, (int)g); + if (iColorType == CFX_Color::kGray) { + int g = static_cast(values[0] * 255 + 0.5f); + color = ArgbEncode(255, g, g, g); return; } - if (syntax.FindTagParamFromStart("rg", 3)) { - iColorType = CFX_Color::kRGB; - float r = FX_atof(syntax.GetWord()) * 255 + 0.5f; - float g = FX_atof(syntax.GetWord()) * 255 + 0.5f; - float b = FX_atof(syntax.GetWord()) * 255 + 0.5f; - color = ArgbEncode(255, (int)r, (int)g, (int)b); + if (iColorType == CFX_Color::kRGB) { + int r = static_cast(values[0] * 255 + 0.5f); + int g = static_cast(values[1] * 255 + 0.5f); + int b = static_cast(values[2] * 255 + 0.5f); + color = ArgbEncode(255, r, g, b); return; } - if (syntax.FindTagParamFromStart("k", 4)) { - iColorType = CFX_Color::kCMYK; - float c = FX_atof(syntax.GetWord()); - float m = FX_atof(syntax.GetWord()); - float y = FX_atof(syntax.GetWord()); - float k = FX_atof(syntax.GetWord()); - float r = 1.0f - std::min(1.0f, c + k); - float g = 1.0f - std::min(1.0f, m + k); - float b = 1.0f - std::min(1.0f, y + k); - color = ArgbEncode(255, (int)(r * 255 + 0.5f), (int)(g * 255 + 0.5f), - (int)(b * 255 + 0.5f)); + if (iColorType == CFX_Color::kCMYK) { + float r = 1.0f - std::min(1.0f, values[0] + values[3]); + float g = 1.0f - std::min(1.0f, values[1] + values[3]); + float b = 1.0f - std::min(1.0f, values[2] + values[3]); + color = ArgbEncode(255, static_cast(r * 255 + 0.5f), + static_cast(g * 255 + 0.5f), + static_cast(b * 255 + 0.5f)); } } -- cgit v1.2.3