aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-21 12:24:58 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-21 12:24:58 +0000
commit74ff1badf43169fa4ecc952994930edec4e56bee (patch)
treeac60e5cd6e14c148ce6b2eeca9ea49fdf289abd8
parentd117a43a68842dc814b030c4528860df2c91ffce (diff)
Fix windows compiler failures by using SkIsFinite.
BUG=skia:2574 Review URL: https://codereview.chromium.org/296103003 git-svn-id: http://skia.googlecode.com/svn/trunk@14821 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--tools/skpdiff/SkPMetric.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/skpdiff/SkPMetric.cpp b/tools/skpdiff/SkPMetric.cpp
index 47880ac291..a433d9f4b3 100644
--- a/tools/skpdiff/SkPMetric.cpp
+++ b/tools/skpdiff/SkPMetric.cpp
@@ -162,7 +162,7 @@ static float contrast_sensitivity(float cyclesPerDegree, float luminance) {
float b = 0.3f * powf(1.0f + 100.0f / luminance, 0.15f);
float exp = expf(-b * cyclesPerDegree);
float root = sqrtf(1.0f + 0.06f * expf(b * cyclesPerDegree));
- if (!std::isfinite(exp) || !std::isfinite(root)) {
+ if (!SkScalarIsFinite(exp) || !SkScalarIsFinite(root)) {
return 0;
}
return a * cyclesPerDegree * exp * root;