diff options
| author |  ehsan.akhgari <ehsan.akhgari@gmail.com> | 2014-12-15 12:08:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-15 12:08:47 -0800 |
| commit | 6f90475632b0ff8e9e83916ee6373d3c26cc9284 (patch) | |
| tree | 14bdd8ebb0291c6391626a52c397c279cf43e932 /include/core | |
| parent | 3fcc125c776c837aa858598ce385f5c6f8f01795 (diff) | |
Rewrite NaN checks in terms of SkScalarIsNaN()
We are trying to replace Skia's NaN checker with our own in Mozilla,
so it would be nice to have to patch a single place by making sure
these NaN checks used SkScalarIsNaN().
BUG=skia:
Review URL: https://codereview.chromium.org/809443002
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkPoint.h | 4 | ||||
| -rw-r--r-- | include/core/SkRect.h | 4 | ||||
| -rw-r--r-- | include/core/SkScalar.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h index 323c824a1b..4a97391c70 100644 --- a/include/core/SkPoint.h +++ b/include/core/SkPoint.h @@ -357,11 +357,11 @@ struct SK_API SkPoint { accum *= fY; // accum is either NaN or it is finite (zero). - SkASSERT(0 == accum || !(accum == accum)); + SkASSERT(0 == accum || SkScalarIsNaN(accum)); // value==value will be true iff value is not NaN // TODO: is it faster to say !accum or accum==accum? - return accum == accum; + return !SkScalarIsNaN(accum); } /** diff --git a/include/core/SkRect.h b/include/core/SkRect.h index 394e45d4ca..0038c7c2fa 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -455,11 +455,11 @@ struct SK_API SkRect { accum *= fBottom; // accum is either NaN or it is finite (zero). - SkASSERT(0 == accum || !(accum == accum)); + SkASSERT(0 == accum || SkScalarIsNaN(accum)); // value==value will be true iff value is not NaN // TODO: is it faster to say !accum or accum==accum? - return accum == accum; + return !SkScalarIsNaN(accum); } SkScalar x() const { return fLeft; } diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index e0490e2b0b..94c3ce15c0 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -127,7 +127,7 @@ static inline bool SkScalarIsFinite(SkScalar x) { SkScalar prod = x * 0; // At this point, prod will either be NaN or 0 // Therefore we can return (prod == prod) or (0 == prod). - return prod == prod; + return !SkScalarIsNaN(prod); } /** |