From 8f4d2306fa866a26f9448048ff63f692b2ba43aa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 17 Dec 2013 16:44:46 +0000 Subject: 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 --- tests/StringTest.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/StringTest.cpp') diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp index 04e04704ab..ceb4df5308 100644 --- a/tests/StringTest.cpp +++ b/tests/StringTest.cpp @@ -157,7 +157,6 @@ DEF_TEST(String, reporter) { { SK_Scalar1, "1" }, { -SK_Scalar1, "-1" }, { SK_Scalar1/2, "0.5" }, -#ifdef SK_SCALAR_IS_FLOAT #ifdef SK_BUILD_FOR_WIN { 3.4028234e38f, "3.4028235e+038" }, { -3.4028234e38f, "-3.4028235e+038" }, @@ -165,7 +164,6 @@ DEF_TEST(String, reporter) { { 3.4028234e38f, "3.4028235e+38" }, { -3.4028234e38f, "-3.4028235e+38" }, #endif -#endif }; for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) { a.reset(); -- cgit v1.2.3