| Index: src/core/SkUtils.cpp
|
| diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp
|
| index eff718b20fbfce51f2c6c4a5416eee273dd5878a..b063071932178b81e62164c08bcbc8208d98e2f7 100644
|
| --- a/src/core/SkUtils.cpp
|
| +++ b/src/core/SkUtils.cpp
|
| @@ -193,7 +193,7 @@ int SkUTF8_CountUnichars(const char utf8[]) {
|
| }
|
|
|
| int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
|
| - SkASSERT(NULL != utf8 || 0 == byteLength);
|
| + SkASSERT(utf8 || 0 == byteLength);
|
|
|
| int count = 0;
|
| const char* stop = utf8 + byteLength;
|
| @@ -206,7 +206,7 @@ int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
|
| }
|
|
|
| SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
|
| - SkASSERT(NULL != utf8);
|
| + SkASSERT(utf8);
|
|
|
| const uint8_t* p = (const uint8_t*)utf8;
|
| int c = *p;
|
| @@ -227,7 +227,7 @@ SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
|
| }
|
|
|
| SkUnichar SkUTF8_NextUnichar(const char** ptr) {
|
| - SkASSERT(NULL != ptr && NULL != *ptr);
|
| + SkASSERT(ptr && *ptr);
|
|
|
| const uint8_t* p = (const uint8_t*)*ptr;
|
| int c = *p;
|
| @@ -249,7 +249,7 @@ SkUnichar SkUTF8_NextUnichar(const char** ptr) {
|
| }
|
|
|
| SkUnichar SkUTF8_PrevUnichar(const char** ptr) {
|
| - SkASSERT(NULL != ptr && NULL != *ptr);
|
| + SkASSERT(ptr && *ptr);
|
|
|
| const char* p = *ptr;
|
|
|
|
|