From ddfc3dcce42ad1dc805f29102f7d056a5809d489 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Thu, 20 Apr 2017 15:29:25 -0400 Subject: Let {Argb,Cmyk}Decode return tuples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic4e766d9417f9a9ece5f9e4269d0f96e1e91639b Reviewed-on: https://pdfium-review.googlesource.com/4392 Commit-Queue: Nicolás Peña Reviewed-by: Tom Sepez --- xfa/fxgraphics/cfx_shading.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxgraphics/cfx_shading.cpp') diff --git a/xfa/fxgraphics/cfx_shading.cpp b/xfa/fxgraphics/cfx_shading.cpp index 7dc8ce3412..b099bb97b1 100644 --- a/xfa/fxgraphics/cfx_shading.cpp +++ b/xfa/fxgraphics/cfx_shading.cpp @@ -51,15 +51,15 @@ void CFX_Shading::InitArgbArray() { int32_t r1; int32_t g1; int32_t b1; - ArgbDecode(m_beginArgb, a1, r1, g1, b1); + std::tie(a1, r1, g1, b1) = ArgbDecode(m_beginArgb); int32_t a2; int32_t r2; int32_t g2; int32_t b2; - ArgbDecode(m_endArgb, a2, r2, g2, b2); + std::tie(a2, r2, g2, b2) = ArgbDecode(m_endArgb); - float f = (float)(FX_SHADING_Steps - 1); + float f = static_cast(FX_SHADING_Steps - 1); float aScale = 1.0 * (a2 - a1) / f; float rScale = 1.0 * (r2 - r1) / f; float gScale = 1.0 * (g2 - g1) / f; -- cgit v1.2.3