From 5476128f0a88217414f05e6a7ee518cdb411d026 Mon Sep 17 00:00:00 2001 From: raftias Date: Thu, 1 Dec 2016 13:44:07 -0500 Subject: Added CMYK support for ICC profiles. Changed ICC parsing/SkGammas/SkColorLookUpTable to handle non-3-channel inputs. Parsed CMYK A2B ICC profiles. Integrated this with SkJpegCodec (the only file that supports CMYK) and SkColorSpaceXform_A2B to allow parsing and color xforming of ICC CMYK images. CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD Change-Id: I11e3d17180244281be3eb43fd608609925a7f71e Reviewed-on: https://skia-review.googlesource.com/5444 Reviewed-by: Matt Sarett Commit-Queue: Matt Sarett --- src/core/SkColorSpaceXform_A2B.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/core/SkColorSpaceXform_A2B.h') diff --git a/src/core/SkColorSpaceXform_A2B.h b/src/core/SkColorSpaceXform_A2B.h index 6beda285e1..9376491fa1 100644 --- a/src/core/SkColorSpaceXform_A2B.h +++ b/src/core/SkColorSpaceXform_A2B.h @@ -32,17 +32,11 @@ public: private: SkColorSpaceXform_A2B(SkColorSpace_A2B* srcSpace, SkColorSpace_XYZ* dstSpace); - enum Channels { - kRGB_Channels = -1, - kR_Channels = 0, - kG_Channels = 1, - kB_Channels = 2 - }; + void addTransferFns(const SkColorSpaceTransferFn& fn, int channelCount); + void addTransferFn(const SkColorSpaceTransferFn& fn, int channelIndex); - - void addTransferFn(const SkColorSpaceTransferFn& fn, Channels channels); - void addTableFn(const SkTableTransferFn& table, Channels channels); + void addTableFn(const SkTableTransferFn& table, int channelIndex); void addMatrix(const SkMatrix44& matrix); -- cgit v1.2.3