From d79ac21b7595442bce82ec93f59cda9f8fb3cb24 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Wed, 12 Jul 2017 14:45:08 -0400 Subject: Move CMYKtoRGB methods to fx_codec and clean them up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL moves CMYKtoRGB methods to fx_codec. It also cleans them up a bit, including allowing them to return tuples instead of having non-const refs in their parameters. Change-Id: Ib3ec45102ec7eff623cd07a624e852d39bf335e4 Reviewed-on: https://pdfium-review.googlesource.com/7591 Commit-Queue: Nicolás Peña Reviewed-by: dsinclair --- core/fxcodec/codec/fx_codec_jpx_unittest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fxcodec/codec/fx_codec_jpx_unittest.cpp') diff --git a/core/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp index 6d1e31a0ee..7e2510546d 100644 --- a/core/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -34,10 +34,10 @@ TEST(fxcodec, CMYK_Rounding) { // Iterate through floats by incrementing the representation, as discussed in // https://randomascii.wordpress.com/2012/01/23/stupid-float-tricks-2/ for (Float_t f = startValue; f.f < endValue; f.i++) { - AdobeCMYK_to_sRGB(f.f, f.f, f.f, f.f, R, G, B); + std::tie(R, G, B) = AdobeCMYK_to_sRGB(f.f, f.f, f.f, f.f); } // Check various other 'special' numbers. - AdobeCMYK_to_sRGB(0.0f, 0.25f, 0.5f, 1.0f, R, G, B); + std::tie(R, G, B) = AdobeCMYK_to_sRGB(0.0f, 0.25f, 0.5f, 1.0f); } TEST(fxcodec, DecodeDataNullDecodeData) { -- cgit v1.2.3