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/DrawPathTest.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tests/DrawPathTest.cpp') diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp index 9a49adfff4..8c77ffe031 100644 --- a/tests/DrawPathTest.cpp +++ b/tests/DrawPathTest.cpp @@ -181,7 +181,6 @@ static void test_inversepathwithclip() { } static void test_bug533() { -#ifdef SK_SCALAR_IS_FLOAT /* http://code.google.com/p/skia/issues/detail?id=533 This particular test/bug only applies to the float case, where the @@ -196,7 +195,6 @@ static void test_bug533() { SkAutoTUnref canvas(new_canvas(640, 480)); canvas.get()->drawPath(path, paint); -#endif } static void test_crbug_140642() { @@ -215,14 +213,11 @@ static void test_crbug_140642() { stroke-dashoffset="-248.135982067"> */ -#ifdef SK_SCALAR_IS_FLOAT const SkScalar vals[] = { 27734, 35660, 2157846850.0f, 247 }; SkDashPathEffect dontAssert(vals, 4, -248.135982067f); -#endif } static void test_crbug_124652() { -#ifdef SK_SCALAR_IS_FLOAT /* http://code.google.com/p/chromium/issues/detail?id=124652 This particular test/bug only applies to the float case, where @@ -231,11 +226,9 @@ static void test_crbug_124652() { SkScalar intervals[2] = {837099584, 33450}; SkAutoTUnref dash( new SkDashPathEffect(intervals, 2, -10, false)); -#endif } static void test_bigcubic() { -#ifdef SK_SCALAR_IS_FLOAT SkPath path; path.moveTo(64, 3); path.cubicTo(-329936, -100000000, -329936, 100000000, 1153, 330003); @@ -245,7 +238,6 @@ static void test_bigcubic() { SkAutoTUnref canvas(new_canvas(640, 480)); canvas.get()->drawPath(path, paint); -#endif } // we used to assert if the bounds of the device (clip) was larger than 32K -- cgit v1.2.3