| Index: tests/PathOpsExtendedTest.cpp
|
| diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
|
| index 1401290f833e45b5493d80d19c93ecf9bd8988d6..720961798580cc840971c77754cc95512ca2d2a3 100644
|
| --- a/tests/PathOpsExtendedTest.cpp
|
| +++ b/tests/PathOpsExtendedTest.cpp
|
| @@ -425,14 +425,14 @@ bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& st
|
| if (!state.fReporter->verbose()) {
|
| return true;
|
| }
|
| - int result = comparePaths(state.fReporter, NULL, path, out, *state.fBitmap);
|
| + int result = comparePaths(state.fReporter, nullptr, path, out, *state.fBitmap);
|
| if (result) {
|
| SkAutoMutexAcquire autoM(simplifyDebugOut);
|
| char temp[8192];
|
| sk_bzero(temp, sizeof(temp));
|
| SkMemoryWStream stream(temp, sizeof(temp));
|
| - const char* pathPrefix = NULL;
|
| - const char* nameSuffix = NULL;
|
| + const char* pathPrefix = nullptr;
|
| + const char* nameSuffix = nullptr;
|
| if (fillType == SkPath::kEvenOdd_FillType) {
|
| pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n";
|
| nameSuffix = "x";
|
| @@ -586,7 +586,7 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) {
|
| inData.setCount((int) inFile.getLength());
|
| size_t inLen = inData.count();
|
| inFile.read(inData.begin(), inLen);
|
| - inFile.setPath(NULL);
|
| + inFile.setPath(nullptr);
|
| char* insert = strstr(inData.begin(), marker);
|
| if (insert) {
|
| insert += sizeof(marker) - 1;
|
| @@ -599,8 +599,8 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) {
|
|
|
| void outputProgress(char* ramStr, const char* pathStr, SkPath::FillType pathFillType) {
|
| const char testFunction[] = "testSimplify(path);";
|
| - const char* pathPrefix = NULL;
|
| - const char* nameSuffix = NULL;
|
| + const char* pathPrefix = nullptr;
|
| + const char* nameSuffix = nullptr;
|
| if (pathFillType == SkPath::kEvenOdd_FillType) {
|
| pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n";
|
| nameSuffix = "x";
|
| @@ -614,7 +614,7 @@ void outputProgress(char* ramStr, const char* pathStr, SkPathOp op) {
|
| SkASSERT((size_t) op < SK_ARRAY_COUNT(opSuffixes));
|
| const char* nameSuffix = opSuffixes[op];
|
| SkMemoryWStream rRamStream(ramStr, PATH_STR_SIZE);
|
| - outputToStream(pathStr, NULL, nameSuffix, testFunction, true, rRamStream);
|
| + outputToStream(pathStr, nullptr, nameSuffix, testFunction, true, rRamStream);
|
| }
|
|
|
| void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count,
|
|
|