aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/MathTest.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-30 15:19:17 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-30 15:19:17 +0000
commit00bf06a142e49f2d6f398127d7e3cf747559a461 (patch)
tree43ea40ffced670601c2d1855c06aca0d87ec5a8b /tests/MathTest.cpp
parentd32369e745d760f76a18dbd027ece4a97f28b4d5 (diff)
Added cast to get MathTest working on Windows
git-svn-id: http://skia.googlecode.com/svn/trunk@4072 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MathTest.cpp')
-rw-r--r--tests/MathTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 11e47d7613..a7ecfa1c74 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -19,7 +19,7 @@ static float sk_fsel(float pred, float result_ge, float result_lt) {
static float fast_floor(float x) {
// float big = sk_fsel(x, 0x1.0p+23, -0x1.0p+23);
float big = sk_fsel(x, (float)(1 << 23), -(float)(1 << 23));
- return (x + big) - big;
+ return (float)(x + big) - big;
}
static float std_floor(float x) {