| Index: tests/PathOpsCubicLineIntersectionIdeas.cpp
|
| diff --git a/tests/PathOpsCubicLineIntersectionIdeas.cpp b/tests/PathOpsCubicLineIntersectionIdeas.cpp
|
| index 6aec8b148a5b031c93967fccd0f1f428affe331f..b23dd0ceaf6b57058a6def5e2cd317a46a0c3049 100644
|
| --- a/tests/PathOpsCubicLineIntersectionIdeas.cpp
|
| +++ b/tests/PathOpsCubicLineIntersectionIdeas.cpp
|
| @@ -194,13 +194,13 @@ DEF_TEST(PathOpsCubicLineRoots, reporter) {
|
| if (realRoots == 3) {
|
| smallest = SkTMin(smallest, allRoots[2]);
|
| }
|
| - SK_ALWAYSBREAK(smallest < 0);
|
| - SK_ALWAYSBREAK(smallest >= -1);
|
| + SkASSERT_RELEASE(smallest < 0);
|
| + SkASSERT_RELEASE(smallest >= -1);
|
| largeBits = 0;
|
| } else {
|
| frexp(largest, &largeBits);
|
| - SK_ALWAYSBREAK(largeBits >= 0);
|
| - SK_ALWAYSBREAK(largeBits < 256);
|
| + SkASSERT_RELEASE(largeBits >= 0);
|
| + SkASSERT_RELEASE(largeBits < 256);
|
| }
|
| double step = 1e-6;
|
| if (largeBits > 21) {
|
| @@ -222,7 +222,7 @@ DEF_TEST(PathOpsCubicLineRoots, reporter) {
|
| break;
|
| }
|
| step *= 1.5;
|
| - SK_ALWAYSBREAK(step < 1);
|
| + SkASSERT_RELEASE(step < 1);
|
| } while (true);
|
| worstStep[largeBits] = SkTMax(worstStep[largeBits], diff);
|
| #if 0
|
| @@ -256,11 +256,11 @@ static double testOneFailure(const CubicLineFailures& failure) {
|
| double allRoots[3] = {0}, validRoots[3] = {0};
|
| int realRoots = SkDCubic::RootsReal(A, B, C, D, allRoots);
|
| int valid = SkDQuad::AddValidTs(allRoots, realRoots, validRoots);
|
| - SK_ALWAYSBREAK(valid == 1);
|
| - SK_ALWAYSBREAK(realRoots != 1);
|
| + SkASSERT_RELEASE(valid == 1);
|
| + SkASSERT_RELEASE(realRoots != 1);
|
| double t = validRoots[0];
|
| SkDPoint calcPt = cubic.ptAtT(t);
|
| - SK_ALWAYSBREAK(!calcPt.approximatelyEqual(pt));
|
| + SkASSERT_RELEASE(!calcPt.approximatelyEqual(pt));
|
| int iters = 0;
|
| double newT = binary_search(cubic, 0.1, pt, t, &iters);
|
| return newT;
|
| @@ -271,7 +271,7 @@ DEF_TEST(PathOpsCubicLineFailures, reporter) {
|
| for (int index = 0; index < cubicLineFailuresCount; ++index) {
|
| const CubicLineFailures& failure = cubicLineFailures[index];
|
| double newT = testOneFailure(failure);
|
| - SK_ALWAYSBREAK(newT >= 0);
|
| + SkASSERT_RELEASE(newT >= 0);
|
| }
|
| }
|
|
|
| @@ -279,5 +279,5 @@ DEF_TEST(PathOpsCubicLineOneFailure, reporter) {
|
| return; // disable for now
|
| const CubicLineFailures& failure = cubicLineFailures[1];
|
| double newT = testOneFailure(failure);
|
| - SK_ALWAYSBREAK(newT >= 0);
|
| + SkASSERT_RELEASE(newT >= 0);
|
| }
|
|
|