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>
diff --git a/third_party/skcms/skcms.c b/third_party/skcms/skcms.c
index ff38286..99b05cb 100644
--- a/third_party/skcms/skcms.c
+++ b/third_party/skcms/skcms.c
@@ -45,8 +45,8 @@
}
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 17803b4..c6dcd2b 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