diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-05-15 19:22:08 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-15 21:01:24 +0000 |
| commit | c8799aa92212400a11357d1c4ea6710e9ed8210d (patch) | |
| tree | e1f5122fb807134edf0a68b72b269c4feb1d18a9 | |
| parent | 072c69cad3b50ba3d04ba7a7d6c9dbec50c1cd4f (diff) | |
Roll skia/third_party/skcms 14c31bf..ce2fabc (1 commits)
https://skia.googlesource.com/skcms.git/+log/14c31bf..ce2fabc
2018-05-15 brianosman@google.com Ignore srcAlpha when the input is CMYK
The AutoRoll server is located here: https://skcms-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=herb@google.com
Change-Id: I32b52c1b555778c72d8038da698c26fb6c3585c0
Reviewed-on: https://skia-review.googlesource.com/128299
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
| -rw-r--r-- | third_party/skcms/src/Transform.c | 2 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/skcms/src/Transform.c b/third_party/skcms/src/Transform.c index 9d359d2623..f253c72721 100644 --- a/third_party/skcms/src/Transform.c +++ b/third_party/skcms/src/Transform.c @@ -442,6 +442,8 @@ bool skcms_Transform(const void* src, // Photoshop creates CMYK images as inverse CMYK. // These happen to be the only ones we've _ever_ seen. *ops++ = Op_invert; + // With CMYK, ignore the alpha type, to avoid changing K or conflating CMY with K. + srcAlpha = skcms_AlphaFormat_Unpremul; } if (srcAlpha == skcms_AlphaFormat_Opaque) { diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 7aead83515..13f363176f 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -14c31bf04af5c4a2b5ae9e1d1944f2173fb4570e
\ No newline at end of file +ce2fabc6e146526bfb843932200ff006f4a2c943
\ No newline at end of file |