diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-04-24 00:11:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-24 00:47:06 +0000 |
| commit | d93136854e874f873a530f76891d2d038603d779 (patch) | |
| tree | 6e5cd26f683e70c7884951026a1fc67421747856 /third_party/skcms | |
| parent | 1b4ad0d1eb4881443dd23002b1238524f662f0b4 (diff) | |
Roll skia/third_party/skcms e492929..6a4194e (1 commits)
https://skia.googlesource.com/skcms.git/+log/e492929..6a4194e
2018-04-24 mtklein@google.com check for finite before casting to int
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.
TBR=stani@google.com
Change-Id: Ib681427f380c6ff4d4a6f8f315d57e43451933fe
Reviewed-on: https://skia-review.googlesource.com/123272
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'third_party/skcms')
| -rw-r--r-- | third_party/skcms/src/TF13.c | 6 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/third_party/skcms/src/TF13.c b/third_party/skcms/src/TF13.c index e045ecc85b..f6bdb3eb70 100644 --- a/third_party/skcms/src/TF13.c +++ b/third_party/skcms/src/TF13.c @@ -8,6 +8,7 @@ #include "../skcms.h" #include "GaussNewton.h" #include "PortableMath.h" +#include <assert.h> #include <limits.h> #include <stdlib.h> @@ -62,6 +63,11 @@ bool skcms_ApproximateCurve13(const skcms_Curve* curve, skcms_TF13* approx, floa *max_error = err; } + assert( isfinitef_(want) ); + if (!isfinitef_(got)) { + return false; + } + // Compare what bytes we'd choose for these floats, rounded, and scaled by 255, // but intentionally not clamped... if this goes negative, we want it to hurt. diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 72230e5cb1..64381c08a2 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -e49292938f5763080adcba2ca1b28c73cc4f17fd
\ No newline at end of file +6a4194ed7d6fc920745f114e568d0fcdf021c0bc
\ No newline at end of file |