diff options
| author |  raftias <raftias@google.com> | 2016-11-30 11:19:22 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-01 16:22:49 +0000 |
| commit | 51c3fcd376c5c9972d9476b5532f6164375a38d1 (patch) | |
| tree | 550b06db1cb58caf5ec966ecaf80725fa5d74468 /dm | |
| parent | 14c8f82334b9b3b20316dc4ba4786d526c2a5012 (diff) | |
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.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5197
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: Id6619f63f04071f79cd2d84321857dfa269ad3aa
Reviewed-on: https://skia-review.googlesource.com/5197
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMSrcSink.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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) { |