| Index: tests/PathOpsSimplifyDegenerateThreadedTest.cpp
|
| diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
|
| index 22997e7a9c2ea2f5cb0cc63fd604764309043eec..9ed1f3a031ef1d05358aa581082ffebaaffa5015 100755
|
| --- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
|
| +++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
|
| @@ -11,7 +11,10 @@ static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
|
| SkASSERT(data);
|
| PathOpsThreadState& state = *data;
|
| char pathStr[1024];
|
| - sk_bzero(pathStr, sizeof(pathStr));
|
| + bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
|
| + if (progress) {
|
| + sk_bzero(pathStr, sizeof(pathStr));
|
| + }
|
| int ax = state.fA & 0x03;
|
| int ay = state.fA >> 2;
|
| int bx = state.fB & 0x03;
|
| @@ -41,19 +44,23 @@ static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
|
| path.lineTo(SkIntToScalar(ex), SkIntToScalar(ey));
|
| path.lineTo(SkIntToScalar(fx), SkIntToScalar(fy));
|
| path.close();
|
| - char* str = pathStr;
|
| - str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
|
| - str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
|
| - str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
|
| - str += sprintf(str, " path.close();\n");
|
| - str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
|
| - str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
|
| - str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
|
| - str += sprintf(str, " path.close();\n");
|
| - outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType);
|
| + if (progress) {
|
| + char* str = pathStr;
|
| + str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
|
| + str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
|
| + str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
|
| + str += sprintf(str, " path.close();\n");
|
| + str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
|
| + str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
|
| + str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
|
| + str += sprintf(str, " path.close();\n");
|
| + outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType);
|
| + }
|
| testSimplify(path, false, out, state, pathStr);
|
| path.setFillType(SkPath::kEvenOdd_FillType);
|
| - outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
|
| + if (progress) {
|
| + outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
|
| + }
|
| testSimplify(path, true, out, state, pathStr);
|
| }
|
| }
|
|
|