diff options
author | caryclark <caryclark@google.com> | 2016-10-06 11:46:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-06 11:46:25 -0700 |
commit | 8f1864386734cfa7650a5576ba453745a407ade2 (patch) | |
tree | 413e5df77a872a26e02dc4b64ef191e6df4948f1 /tests/PathOpsOpLoopThreadedTest.cpp | |
parent | 33cbfd75afdd383770bb6253c06ba819a2481a35 (diff) |
remove sprintf
Most uses of sprintf are
in pathops testing.
Replace them with
SkString::appendf
and replace the remaining
with snprintf
R=scroggo@google.com
BUG=skia:2716
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2391133005
Review-Url: https://codereview.chromium.org/2391133005
Diffstat (limited to 'tests/PathOpsOpLoopThreadedTest.cpp')
-rw-r--r-- | tests/PathOpsOpLoopThreadedTest.cpp | 71 |
1 files changed, 32 insertions, 39 deletions
diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp index 56c5068d7a..3854f90b08 100644 --- a/tests/PathOpsOpLoopThreadedTest.cpp +++ b/tests/PathOpsOpLoopThreadedTest.cpp @@ -6,23 +6,24 @@ */ #include "PathOpsExtendedTest.h" #include "PathOpsThreadedCommon.h" +#include "SkString.h" -static int add_point(char* str, SkScalar x, SkScalar y) { - int result; +static int loopNo = 17; + +static void add_point(SkString* str, SkScalar x, SkScalar y) { int asInt = SkScalarRoundToInt(x); if (SkIntToScalar(asInt) == x) { - result = sprintf(str, "%d", asInt); + str->appendf("%d", asInt); } else { - result = sprintf(str, "%1.9gf", x); + str->appendf("%1.9gf", x); } - result += sprintf(str + result, ","); + str->appendf(","); asInt = SkScalarRoundToInt(y); if (SkIntToScalar(asInt) == y) { - result += sprintf(str + result, "%d", asInt); + str->appendf("%d", asInt); } else { - result += sprintf(str + result, "%1.9gf", y); + str->appendf("%1.9gf", y); } - return result; } static void testOpLoopsMain(PathOpsThreadState* data) { @@ -31,11 +32,7 @@ static void testOpLoopsMain(PathOpsThreadState* data) { #endif SkASSERT(data); PathOpsThreadState& state = *data; - char pathStr[1024]; // gdb: set print elements 400 - bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter? - if (progress) { - sk_bzero(pathStr, sizeof(pathStr)); - } + SkString pathStr; for (int a = 0 ; a < 6; ++a) { for (int b = a + 1 ; b < 7; ++b) { for (int c = 0 ; c < 6; ++c) { @@ -51,30 +48,6 @@ static void testOpLoopsMain(PathOpsThreadState* data) { SkPoint endD = { midB.fX - v.fY * state.fD / 3, midB.fY + v.fX * state.fD / 3 }; SkPath pathA, pathB; - if (progress) { - char* str = pathStr; - const int loopNo = 17; - str += sprintf(str, "static void loop%d(skiatest::Reporter* reporter," - " const char* filename) {\n", loopNo); - str += sprintf(str, " SkPath path, pathB;\n"); - str += sprintf(str, " path.moveTo(%d,%d);\n", a, b); - str += sprintf(str, " path.cubicTo(%d,%d, ", c, d); - str += add_point(str, endC.fX, endC.fY); - str += sprintf(str, ", "); - str += add_point(str, endD.fX, endD.fY); - str += sprintf(str, ");\n"); - str += sprintf(str, " path.close();\n"); - str += sprintf(str, " pathB.moveTo(%d,%d);\n", c, d); - str += sprintf(str, " pathB.cubicTo("); - str += add_point(str, endC.fX, endC.fY); - str += sprintf(str, ", "); - str += add_point(str, endD.fX, endD.fY); - str += sprintf(str, ", %d,%d);\n", a, b); - str += sprintf(str, " pathB.close();\n"); - str += sprintf(str, " testPathOp(reporter, path, pathB, kIntersect_SkPathOp," - " filename);\n"); - str += sprintf(str, "}\n"); - } pathA.moveTo(SkIntToScalar(a), SkIntToScalar(b)); pathA.cubicTo(SkIntToScalar(c), SkIntToScalar(d), endC.fX, endC.fY, endD.fX, endD.fY); pathA.close(); @@ -82,8 +55,28 @@ static void testOpLoopsMain(PathOpsThreadState* data) { pathB.cubicTo(endC.fX, endC.fY, endD.fX, endD.fY, SkIntToScalar(a), SkIntToScalar(b)); pathB.close(); // SkDebugf("%s\n", pathStr); - if (progress) { - outputProgress(state.fPathStr, pathStr, kIntersect_SkPathOp); + if (state.fReporter->verbose()) { + pathStr.printf("static void loop%d(skiatest::Reporter* reporter," + " const char* filename) {\n", loopNo); + pathStr.appendf(" SkPath path, pathB;\n"); + pathStr.appendf(" path.moveTo(%d,%d);\n", a, b); + pathStr.appendf(" path.cubicTo(%d,%d, ", c, d); + add_point(&pathStr, endC.fX, endC.fY); + pathStr.appendf(", "); + add_point(&pathStr, endD.fX, endD.fY); + pathStr.appendf(");\n"); + pathStr.appendf(" path.close();\n"); + pathStr.appendf(" pathB.moveTo(%d,%d);\n", c, d); + pathStr.appendf(" pathB.cubicTo("); + add_point(&pathStr, endC.fX, endC.fY); + pathStr.appendf(", "); + add_point(&pathStr, endD.fX, endD.fY); + pathStr.appendf(", %d,%d);\n", a, b); + pathStr.appendf(" pathB.close();\n"); + pathStr.appendf(" testPathOp(reporter, path, pathB, kIntersect_SkPathOp," + " filename);\n"); + pathStr.appendf("}\n"); + outputProgress(state.fPathStr, pathStr.c_str(), kIntersect_SkPathOp); } testPathOp(state.fReporter, pathA, pathB, kIntersect_SkPathOp, "loops"); } |