diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 19:13:59 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-15 19:13:59 +0000 |
| commit | ad65a3e5fb1f94699f183551b828efbcc6a133ce (patch) | |
| tree | 5908b619b257c5bfc45ddb40be1b9099c37d67ee /tests/PathOpsCubicIntersectionTest.cpp | |
| parent | 9becf0090f9c1c14f42d161b9a1fb3af142f9420 (diff) | |
path ops work in progress
standardize tests
use SK_ARRAY_COUNT everywhere
debug why x87 differs from SIMD 64
various platform specific fixes
git-svn-id: http://skia.googlecode.com/svn/trunk@8689 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathOpsCubicIntersectionTest.cpp')
| -rw-r--r-- | tests/PathOpsCubicIntersectionTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp index be9781dde6..f3db3c0909 100644 --- a/tests/PathOpsCubicIntersectionTest.cpp +++ b/tests/PathOpsCubicIntersectionTest.cpp @@ -160,7 +160,7 @@ static const SkDCubic testSet[] = { {56.4860195, 60.529264}}}, }; -const size_t testSetCount = sizeof(testSet) / sizeof(testSet[0]); +const size_t testSetCount = SK_ARRAY_COUNT(testSet); static const SkDCubic newTestSet[] = { {{{0, 1}, {1, 5}, {1, 0}, {1, 0}}}, @@ -220,7 +220,7 @@ static const SkDCubic newTestSet[] = { {{{0, 3}, {0, 1}, {2, 0}, {1, 0}}}, }; -const size_t newTestSetCount = sizeof(newTestSet) / sizeof(newTestSet[0]); +const size_t newTestSetCount = SK_ARRAY_COUNT(newTestSet); static void oneOff(skiatest::Reporter* reporter, const SkDCubic& cubic1, const SkDCubic& cubic2) { #if ONE_OFF_DEBUG @@ -463,7 +463,7 @@ static void cubicIntersectionSelfTest(skiatest::Reporter* reporter) { {{{6.71, 3.14}, {7.99, 2.75}, {8.27, 1.96}, {6.35, 3.57}}}, {{{12.81, 7.27}, {7.22, 6.98}, {12.49, 8.97}, {11.42, 6.18}}}, }; - size_t selfSetCount = sizeof(selfSet) / sizeof(selfSet[0]); + size_t selfSetCount = SK_ARRAY_COUNT(selfSet); size_t firstFail = 1; for (size_t index = firstFail; index < selfSetCount; ++index) { const SkDCubic& cubic = selfSet[index]; @@ -500,7 +500,7 @@ static void cubicIntersectionSelfTest(skiatest::Reporter* reporter) { } } -static void TestCubicIntersection(skiatest::Reporter* reporter) { +static void PathOpsCubicIntersectionTest(skiatest::Reporter* reporter) { oneOffTest(reporter); oneOffTests(reporter); cubicIntersectionSelfTest(reporter); @@ -510,4 +510,4 @@ static void TestCubicIntersection(skiatest::Reporter* reporter) { } #include "TestClassDef.h" -DEFINE_TESTCLASS("PathOpsCubicIntersectionTest", CubicIntersectionTestClass, TestCubicIntersection) +DEFINE_TESTCLASS_SHORT(PathOpsCubicIntersectionTest) |