diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-09 02:24:26 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-09 02:24:26 +0000 |
| commit | d41344553163085bfcfaf7d5882c6028934f8e3b (patch) | |
| tree | 5dd30ae71a99eeb6bf4ffd812ae36313d5c5a160 /tests/MathTest.cpp | |
| parent | 337490d4ae0138e93eff01ded76b1140d105a023 (diff) | |
update to work correctly for scalar == fixed or float
git-svn-id: http://skia.googlecode.com/svn/trunk@780 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MathTest.cpp')
| -rw-r--r-- | tests/MathTest.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp index 9aed9f9aa0..493691e6f7 100644 --- a/tests/MathTest.cpp +++ b/tests/MathTest.cpp @@ -146,9 +146,11 @@ static void unittest_fastfloat(skiatest::Reporter* reporter) { } } +#ifdef SK_SCALAR_IS_FLOAT static float make_zero() { return sk_float_sin(0); } +#endif static void unittest_isfinite(skiatest::Reporter* reporter) { #ifdef SK_SCALAR_IS_FLOAT @@ -156,28 +158,24 @@ static void unittest_isfinite(skiatest::Reporter* reporter) { float inf = 1.0 / make_zero(); float big = 3.40282e+038; - REPORTER_ASSERT(reporter, SkScalarIsNaN(nan)); REPORTER_ASSERT(reporter, !SkScalarIsNaN(inf)); + REPORTER_ASSERT(reporter, !SkScalarIsNaN(-inf)); + REPORTER_ASSERT(reporter, !SkScalarIsFinite(inf)); + REPORTER_ASSERT(reporter, !SkScalarIsFinite(-inf)); +#else + SkFixed nan = SK_FixedNaN; + SkFixed big = SK_FixedMax; +#endif + + REPORTER_ASSERT(reporter, SkScalarIsNaN(nan)); REPORTER_ASSERT(reporter, !SkScalarIsNaN(big)); REPORTER_ASSERT(reporter, !SkScalarIsNaN(-big)); REPORTER_ASSERT(reporter, !SkScalarIsNaN(0)); - + REPORTER_ASSERT(reporter, !SkScalarIsFinite(nan)); - REPORTER_ASSERT(reporter, !SkScalarIsFinite(inf)); REPORTER_ASSERT(reporter, SkScalarIsFinite(big)); REPORTER_ASSERT(reporter, SkScalarIsFinite(-big)); REPORTER_ASSERT(reporter, SkScalarIsFinite(0)); -#else - REPORTER_ASSERT(reporter, SkScalarIsNaN(0x80000000)); - REPORTER_ASSERT(reporter, !SkScalarIsNaN(0x7FFFFFFF)); - REPORTER_ASSERT(reporter, !SkScalarIsNaN(0x80000001)); - REPORTER_ASSERT(reporter, !SkScalarIsNaN(0)); - - REPORTER_ASSERT(reporter, !SkScalarIsFinite(0x80000000)); - REPORTER_ASSERT(reporter, SkScalarIsFinite(0x7FFFFFFF)); - REPORTER_ASSERT(reporter, SkScalarIsFinite(0x80000001)); - REPORTER_ASSERT(reporter, SkScalarIsFinite(0)); -#endif } #endif |