diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-07-12 14:45:08 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-12 18:58:24 +0000 |
| commit | d79ac21b7595442bce82ec93f59cda9f8fb3cb24 (patch) | |
| tree | 2c479141e360094a21cad7a1566a0c1a04e8a9c9 /core/fxcodec/fx_codec.h | |
| parent | 58bf3de718e510648ee136c887be5b2d577644a7 (diff) | |
| download | pdfium-d79ac21b7595442bce82ec93f59cda9f8fb3cb24.tar.xz | |
Move CMYKtoRGB methods to fx_codec and clean them up
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 <npm@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/fx_codec.h')
| -rw-r--r-- | core/fxcodec/fx_codec.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 6922b359e5..71b002282c 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -9,6 +9,7 @@ #include <map> #include <memory> +#include <tuple> #include <utility> #include <vector> @@ -118,20 +119,14 @@ void sRGB_to_AdobeCMYK(float R, float& m, float& y, float& k); -void AdobeCMYK_to_sRGB(float c, - float m, - float y, - float k, - float& R, - float& G, - float& B); -void AdobeCMYK_to_sRGB1(uint8_t c, - uint8_t m, - uint8_t y, - uint8_t k, - uint8_t& R, - uint8_t& G, - uint8_t& B); +std::tuple<float, float, float> AdobeCMYK_to_sRGB(float c, + float m, + float y, + float k); +std::tuple<uint8_t, uint8_t, uint8_t> AdobeCMYK_to_sRGB1(uint8_t c, + uint8_t m, + uint8_t y, + uint8_t k); void FaxG4Decode(const uint8_t* src_buf, uint32_t src_size, int* pbitpos, |