diff options
| author | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2019-09-30 10:51:14 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-03-12 07:30:06 +0000 |
| commit | 1e19109f2cd38c866b8b18e854a4cfbf6727cabb (patch) | |
| tree | e36be8bc443f2154e38e2f75e17da5a1c48fbd94 | |
| parent | 4ea2213507a2317fef895a1ab473f9a2729d74af (diff) | |
| download | qtwebengine-chromium-1e19109f2cd38c866b8b18e854a4cfbf6727cabb.tar.gz | |
Fix skia crash on Windows after 77-merge
This patch causes a crash on Windows:
https://skia-review.googlesource.com/c/skia/+/166840
Change-Id: Icccf5c32f2ec8e93737d18b8e5a84d1aa9b11549
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 62aa7cb6e09ae3adec5a597a2d21e0b5f5a3bfbd)
| -rw-r--r-- | chromium/third_party/skia/include/private/SkFloatingPoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/skia/include/private/SkFloatingPoint.h b/chromium/third_party/skia/include/private/SkFloatingPoint.h index f0ca4bbea29..66e75d03692 100644 --- a/chromium/third_party/skia/include/private/SkFloatingPoint.h +++ b/chromium/third_party/skia/include/private/SkFloatingPoint.h @@ -166,11 +166,11 @@ static inline float sk_double_to_float(double x) { return static_cast<float>(x); } -#define SK_FloatNaN std::numeric_limits<float>::quiet_NaN() +#define SK_FloatNaN NAN #define SK_FloatInfinity (+std::numeric_limits<float>::infinity()) #define SK_FloatNegativeInfinity (-std::numeric_limits<float>::infinity()) -#define SK_DoubleNaN std::numeric_limits<double>::quiet_NaN() +#define SK_DoubleNaN NAN // Returns false if any of the floats are outside of [0...1] // Returns true if count is 0 |