From 8f1864386734cfa7650a5576ba453745a407ade2 Mon Sep 17 00:00:00 2001 From: caryclark Date: Thu, 6 Oct 2016 11:46:25 -0700 Subject: 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 --- .../PathOpsSimplifyQuadralateralsThreadedTest.cpp | 48 +++++++++++----------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp') diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp index f2c1dfc990..1ea55e24c0 100644 --- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp +++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp @@ -6,16 +6,15 @@ */ #include "PathOpsExtendedTest.h" #include "PathOpsThreadedCommon.h" +#include "SkString.h" + +static int loopNo = 1; static void testSimplifyQuadralateralsMain(PathOpsThreadState* data) { SkASSERT(data); PathOpsThreadState& state = *data; - char pathStr[1024]; - bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter? - if (progress) { - sk_bzero(pathStr, sizeof(pathStr)); - } + SkString pathStr; int ax = state.fA & 0x03; int ay = state.fA >> 2; int bx = state.fB & 0x03; @@ -48,27 +47,30 @@ static void testSimplifyQuadralateralsMain(PathOpsThreadState* data) path.lineTo(SkIntToScalar(gx), SkIntToScalar(gy)); path.lineTo(SkIntToScalar(hx), SkIntToScalar(hy)); path.close(); - if (progress) { - // gdb: set print elements 400 - 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.lineTo(%d, %d);\n", dx, dy); - str += sprintf(str, " path.close();\n"); - str += sprintf(str, " path.moveTo(%d, %d);\n", ex, ey); - str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy); - str += sprintf(str, " path.lineTo(%d, %d);\n", gx, gy); - str += sprintf(str, " path.lineTo(%d, %d);\n", hx, hy); - str += sprintf(str, " path.close();\n"); - outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType); + if (state.fReporter->verbose()) { + pathStr.printf("static void quadralateralSimplify%d(skiatest::Reporter*" + "reporter, const char* filename) {\n", loopNo); + pathStr.appendf(" SkPath path;\n"); + pathStr.appendf(" path.moveTo(%d, %d);\n", ax, ay); + pathStr.appendf(" path.lineTo(%d, %d);\n", bx, by); + pathStr.appendf(" path.lineTo(%d, %d);\n", cx, cy); + pathStr.appendf(" path.lineTo(%d, %d);\n", dx, dy); + pathStr.appendf(" path.close();\n"); + pathStr.appendf(" path.moveTo(%d, %d);\n", ex, ey); + pathStr.appendf(" path.lineTo(%d, %d);\n", fx, fy); + pathStr.appendf(" path.lineTo(%d, %d);\n", gx, gy); + pathStr.appendf(" path.lineTo(%d, %d);\n", hx, hy); + pathStr.appendf(" path.close();\n"); + pathStr.appendf(" testPathSimplify(reporter, path, filename);\n"); + pathStr.appendf("}\n"); + outputProgress(state.fPathStr, pathStr.c_str(), SkPath::kWinding_FillType); } - testSimplify(path, false, out, state, pathStr); + testSimplify(path, false, out, state, pathStr.c_str()); path.setFillType(SkPath::kEvenOdd_FillType); - if (progress) { - outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType); + if (state.fReporter->verbose()) { + outputProgress(state.fPathStr, pathStr.c_str(), SkPath::kEvenOdd_FillType); } - testSimplify(path, true, out, state, pathStr); + testSimplify(path, true, out, state, pathStr.c_str()); } } } -- cgit v1.2.3