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-10 22:08:05 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-10 22:47:26 +0000 |
| commit | 2128b4ac44e5c9f123259b11c675a2152b19f44b (patch) | |
| tree | 15b1ad622108d01b910e4ee846d5e680e09a8087 /third_party | |
| parent | 5c560c90f7345cb0bc57571eb3215ad25c1a1b10 (diff) | |
Roll skia/third_party/skcms 5b9549a..28e8b32 (1 commits)
https://skia.googlesource.com/skcms.git/+log/5b9549a..28e8b32
2018-05-10 mtklein@chromium.org alternate isfinitef_()
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=egdaniel@google.com
Change-Id: I7f97daac4d2caa153425e43ce6bd10cda400e91f
Reviewed-on: https://skia-review.googlesource.com/127443
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/src/PortableMath.c | 6 | ||||
| -rw-r--r-- | third_party/skcms/src/PortableMath.h | 2 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/third_party/skcms/src/PortableMath.c b/third_party/skcms/src/PortableMath.c index 9e1a138713..d63d6abb0c 100644 --- a/third_party/skcms/src/PortableMath.c +++ b/third_party/skcms/src/PortableMath.c @@ -60,9 +60,3 @@ float powf_(float x, float y) { return (x == 0) || (x == 1) ? x : r * exp2f_(log2f_(x) * y); } - -bool isfinitef_(float x) { - uint32_t bits; - small_memcpy(&bits, &x, sizeof(bits)); - return (bits & 0x7f800000) != 0x7f800000; -} diff --git a/third_party/skcms/src/PortableMath.h b/third_party/skcms/src/PortableMath.h index efa59bf704..58a2fa8751 100644 --- a/third_party/skcms/src/PortableMath.h +++ b/third_party/skcms/src/PortableMath.h @@ -27,4 +27,4 @@ float log2f_(float); float exp2f_(float); float powf_(float, float); -bool isfinitef_(float); +static inline bool isfinitef_(float x) { return 0 == x*0; } diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 6a74e30c81..720d2402e3 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -5b9549acaa26e3e2cae8919a0ee0e4cdeb59e1e8
\ No newline at end of file +28e8b3248d725ed1a7e71d0c9d3dffb3cee2c561
\ No newline at end of file |