| Index: tools/picture_utils.cpp
|
| diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp
|
| index 5c120b010d98ca56ebd7fe079eb01c0740190f36..9661daf2d0af0768b5b9c9d55eaec714c9b3a5bc 100644
|
| --- a/tools/picture_utils.cpp
|
| +++ b/tools/picture_utils.cpp
|
| @@ -16,7 +16,7 @@
|
|
|
| namespace sk_tools {
|
| void force_all_opaque(const SkBitmap& bitmap) {
|
| - SkASSERT(NULL == bitmap.getTexture());
|
| + SkASSERT(nullptr == bitmap.getTexture());
|
| SkASSERT(kN32_SkColorType == bitmap.colorType());
|
| if (bitmap.getTexture() || kN32_SkColorType == bitmap.colorType()) {
|
| return;
|
| @@ -31,7 +31,7 @@ namespace sk_tools {
|
| }
|
|
|
| void replace_char(SkString* str, const char oldChar, const char newChar) {
|
| - if (NULL == str) {
|
| + if (nullptr == str) {
|
| return;
|
| }
|
| for (size_t i = 0; i < str->size(); ++i) {
|
|
|