| Index: src/core/SkWriter32.cpp
|
| diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp
|
| index a1a8b8800a2dd26c7d52d11ec44122ceea92c446..457cff49ababf0068a1a06017546093371b39476 100644
|
| --- a/src/core/SkWriter32.cpp
|
| +++ b/src/core/SkWriter32.cpp
|
| @@ -37,7 +37,7 @@ size_t SkReader32::readIntoString(SkString* copy) {
|
| }
|
|
|
| void SkWriter32::writeString(const char str[], size_t len) {
|
| - if (NULL == str) {
|
| + if (nullptr == str) {
|
| str = "";
|
| len = 0;
|
| }
|
| @@ -64,7 +64,7 @@ size_t SkWriter32::WriteStringSize(const char* str, size_t len) {
|
| }
|
|
|
| void SkWriter32::growToAtLeast(size_t size) {
|
| - const bool wasExternal = (fExternal != NULL) && (fData == fExternal);
|
| + const bool wasExternal = (fExternal != nullptr) && (fData == fExternal);
|
|
|
| fCapacity = 4096 + SkTMax(size, fCapacity + (fCapacity / 2));
|
| fInternal.realloc(fCapacity);
|
|
|