From c7a4e7751b0c9aa797c142332c1e1b7f68817d37 Mon Sep 17 00:00:00 2001 From: skia-autoroll Date: Tue, 15 Oct 2019 19:47:13 +0000 Subject: [PATCH] Roll skia/third_party/skcms 8c5dee1e7fe2..8e28e18b5c9e (1 commits) https://skia.googlesource.com/skcms.git/+log/8c5dee1e7fe2..8e28e18b5c9e git log 8c5dee1e7fe2..8e28e18b5c9e --date=short --no-merges --format='%ad %ae %s' 2019-10-15 mtklein@google.com check we've fit an sRGB-ish TF Created with: gclient setdep -r skia/third_party/skcms@8e28e18b5c9e If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skcms-skia-autoroll Please CC csmartdalton@google.com,mtklein@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-blink-rel Bug: None Change-Id: Ibd1304ec2e3356ee2881f8f7472a466a3b45adc0 TBR=csmartdalton@google.com,mtklein@google.com TBR=csmartdalton@google.com,mtklein@google.com Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248840 Reviewed-by: skia-autoroll Reviewed-by: Chris Dalton Commit-Queue: skia-autoroll --- third_party/skcms/skcms.cc | 7 +++++++ third_party/skcms/version.sha1 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc index bace176b94..6b4d87b15d 100644 --- a/third_party/skcms/skcms.cc +++ b/third_party/skcms/skcms.cc @@ -1872,6 +1872,13 @@ bool skcms_ApproximateCurve(const skcms_Curve* curve, } } + // We'd better have a sane, sRGB-ish TF by now. + // Other non-Bad TFs would be fine, but we know we've only ever tried to fit sRGBish; + // anything else is just some accident of math and the way we pun tf.g as a type flag. + if (sRGBish != classify(tf)) { + continue; + } + // We find our error by roundtripping the table through tf_inv. // // (The most likely use case for this approximation is to be inverted and diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index ab5c7afa49..f6db96d095 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -8c5dee1e7fe2dfd771d9f4c0db9e166c2cf00b6a \ No newline at end of file +8e28e18b5c9e38265362171570ccfedcbf662761 \ No newline at end of file