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 --- dm/DMSrcSink.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 0a54702d08..31a3bc7059 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1018,11 +1018,7 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const { size_t rowBytes = bitmap.rowBytes(); SkCodec::Result r = codec->getPixels(decodeInfo, bitmap.getPixels(), rowBytes); if (SkCodec::kSuccess != r && SkCodec::kIncompleteInput != r) { - // FIXME (raftias): - // This should be a fatal error. We need to add support for - // A2B images in SkColorSpaceXform. - return Error::Nonfatal(SkStringPrintf("Couldn't getPixels %s. Error code %d", - fPath.c_str(), r)); + return SkStringPrintf("Couldn't getPixels %s. Error code %d", fPath.c_str(), r); } switch (fMode) { -- cgit v1.2.3