diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-07-03 18:14:31 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-03 18:46:25 +0000 |
| commit | 8cefce1c8076fe366a19d30151b410ba9df77bb6 (patch) | |
| tree | ad2c0c2fc80a43c24e0d438b5a52008bba77d131 /third_party | |
| parent | 386a9b6385dcb60206a291a8020224a749b4bc23 (diff) | |
Roll skia/third_party/skcms 678e47d97bc5..f447e42de725 (1 commits)
https://skia.googlesource.com/skcms.git/+log/678e47d97bc5..f447e42de725
2018-07-03 mtklein@chromium.org centralize and clean up disabled warnings
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=ethannicholas@google.com
Change-Id: Ic4b606d3193354d2cc8c8a7efca3fe8148b58925
Reviewed-on: https://skia-review.googlesource.com/139241
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/skcms/skcms.c | 4 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/third_party/skcms/skcms.c b/third_party/skcms/skcms.c index ff382860d9..99b05cbca0 100644 --- a/third_party/skcms/skcms.c +++ b/third_party/skcms/skcms.c @@ -45,8 +45,8 @@ static float eval_curve(const skcms_Curve* curve, float x) { } float ix = fmaxf_(0, fminf_(x, 1)) * (curve->table_entries - 1); - int lo = (int) ix, - hi = (int)minus_1_ulp(ix + 1.0f); + int lo = (int) ix , + hi = (int)(float)minus_1_ulp(ix + 1.0f); float t = ix - (float)lo; float l, h; diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 17803b4978..c6dcd2b8fa 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -678e47d97bc59b600f189a2a1cf5f66e6780c294
\ No newline at end of file +f447e42de7255d262856aa710e84553a906e872b
\ No newline at end of file |