| Index: tools/image_expectations.cpp
|
| diff --git a/tools/image_expectations.cpp b/tools/image_expectations.cpp
|
| index 05a905dd585dbc34aca6fb47de70b0b253bb20c9..cb0c03afc6b5b55c0f8d6be6e2160448327637b9 100644
|
| --- a/tools/image_expectations.cpp
|
| +++ b/tools/image_expectations.cpp
|
| @@ -122,12 +122,12 @@ namespace sk_tools {
|
| // ImageResultsAndExpectations class...
|
|
|
| bool ImageResultsAndExpectations::readExpectationsFile(const char *jsonPath) {
|
| - if (NULL == jsonPath) {
|
| + if (nullptr == jsonPath) {
|
| SkDebugf("JSON expectations filename not specified\n");
|
| return false;
|
| }
|
| SkFILE* filePtr = sk_fopen(jsonPath, kRead_SkFILE_Flag);
|
| - if (NULL == filePtr) {
|
| + if (nullptr == filePtr) {
|
| SkDebugf("JSON expectations file '%s' does not exist\n", jsonPath);
|
| return false;
|
| }
|
| @@ -188,7 +188,7 @@ namespace sk_tools {
|
| actualImage[kJsonKey_Image_ComparisonResult] = comparisonResult;
|
|
|
| // Add this actual result to our collection.
|
| - if (NULL == tileNumber) {
|
| + if (nullptr == tileNumber) {
|
| fActualResults[sourceName][kJsonKey_Source_WholeImage] = actualImage;
|
| } else {
|
| fActualResults[sourceName][kJsonKey_Source_TiledImages][*tileNumber] = actualImage;
|
| @@ -210,7 +210,7 @@ namespace sk_tools {
|
| }
|
|
|
| Json::Value expectedImage;
|
| - if (NULL == tileNumber) {
|
| + if (nullptr == tileNumber) {
|
| expectedImage = fExpectedResults[sourceName][kJsonKey_Source_WholeImage];
|
| } else {
|
| expectedImage = fExpectedResults[sourceName][kJsonKey_Source_TiledImages][*tileNumber];
|
| @@ -242,7 +242,7 @@ namespace sk_tools {
|
| /*static*/ bool ImageResultsAndExpectations::Parse(SkFILE *filePtr,
|
| Json::Value *jsonRoot) {
|
| SkAutoDataUnref dataRef(SkData::NewFromFILE(filePtr));
|
| - if (NULL == dataRef.get()) {
|
| + if (nullptr == dataRef.get()) {
|
| return false;
|
| }
|
|
|
|
|