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 /tests/PDFDeflateWStreamTest.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 'tests/PDFDeflateWStreamTest.cpp')
| -rw-r--r-- | tests/PDFDeflateWStreamTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp index a85212c2c3..f4d8dd3730 100644 --- a/tests/PDFDeflateWStreamTest.cpp +++ b/tests/PDFDeflateWStreamTest.cpp @@ -27,7 +27,7 @@ void skia_free_func(void*, void* address) { sk_free(address); } /** * Use the un-deflate compression algorithm to decompress the data in src, - * returning the result. Returns NULL if an error occurs. + * returning the result. Returns nullptr if an error occurs. */ SkStreamAsset* stream_inflate(SkStream* src) { SkDynamicMemoryWStream decompressedDynamicMemoryWStream; @@ -39,8 +39,8 @@ SkStreamAsset* stream_inflate(SkStream* src) { z_stream flateData; flateData.zalloc = &skia_alloc_func; flateData.zfree = &skia_free_func; - flateData.opaque = NULL; - flateData.next_in = NULL; + flateData.opaque = nullptr; + flateData.next_in = nullptr; flateData.avail_in = 0; flateData.next_out = outputBuffer; flateData.avail_out = kBufferSize; @@ -51,8 +51,8 @@ SkStreamAsset* stream_inflate(SkStream* src) { uint8_t* input = (uint8_t*)src->getMemoryBase(); size_t inputLength = src->getLength(); - if (input == NULL || inputLength == 0) { - input = NULL; + if (input == nullptr || inputLength == 0) { + input = nullptr; flateData.next_in = inputBuffer; flateData.avail_in = 0; } else { @@ -73,7 +73,7 @@ SkStreamAsset* stream_inflate(SkStream* src) { if (rc != Z_OK) break; if (flateData.avail_in == 0) { - if (input != NULL) + if (input != nullptr) break; size_t read = src->read(&inputBuffer, kBufferSize); if (read == 0) |