diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/core/SkUtils.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/core/SkUtils.cpp')
-rw-r--r-- | src/core/SkUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp index eecf122100..b3f698b4e7 100644 --- a/src/core/SkUtils.cpp +++ b/src/core/SkUtils.cpp @@ -155,7 +155,7 @@ size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[]) { *--utf8 = (char)(~(0xFF >> count) | uni); } - SkASSERT(utf8 == NULL || orig == SkUTF8_ToUnichar(utf8)); + SkASSERT(utf8 == nullptr || orig == SkUTF8_ToUnichar(utf8)); return count; } @@ -260,14 +260,14 @@ size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues, return 0; } - SkASSERT(utf16 != NULL); + SkASSERT(utf16 != nullptr); const uint16_t* stop = utf16 + numberOf16BitValues; size_t size = 0; - if (utf8 == NULL) { // just count + if (utf8 == nullptr) { // just count while (utf16 < stop) { - size += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), NULL); + size += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), nullptr); } } else { char* start = utf8; |