diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
| commit | 8f4d2306fa866a26f9448048ff63f692b2ba43aa (patch) | |
| tree | 7a48d817cb5220f87e81781320b002eead2495a0 /tests/InfRectTest.cpp | |
| parent | a34b638b909f58dd7c66546a0f49923112f7f785 (diff) | |
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats
To keep the CL (slightly) managable, this does not make any changes to
existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this
time around.
BUG=
R=bsalomon@google.com, caryclark@google.com
Review URL: https://codereview.chromium.org/117053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/InfRectTest.cpp')
| -rw-r--r-- | tests/InfRectTest.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp index 3d964bdccf..674cf5b802 100644 --- a/tests/InfRectTest.cpp +++ b/tests/InfRectTest.cpp @@ -10,11 +10,9 @@ #include "SkRandom.h" #include "SkRect.h" -#ifdef SK_SCALAR_IS_FLOAT static float make_zero() { return sk_float_sin(0); } -#endif struct RectCenter { SkIRect fRect; @@ -59,14 +57,9 @@ static void check_invalid(skiatest::Reporter* reporter, // Tests that isFinite() will reject any rect with +/-inf values // as one of its coordinates. DEF_TEST(InfRect, reporter) { -#ifdef SK_SCALAR_IS_FLOAT float inf = 1 / make_zero(); // infinity float nan = inf * 0; SkASSERT(!(nan == nan)); -#else - SkFixed inf = SK_FixedNaN; - SkFixed nan = SK_FixedNaN; -#endif SkScalar small = SkIntToScalar(10); SkScalar big = SkIntToScalar(100); |