diff options
author | Ben Wagner <bungeman@google.com> | 2017-08-28 10:34:05 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-28 17:48:57 +0000 |
commit | a93a14a99816d25b773f0b12868143702baf44bf (patch) | |
tree | 727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /tools/debugger | |
parent | 695db408437807d049ecc02b3b852704092728f2 (diff) |
Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's
-Wzero-as-null-pointer-constant. This updates most issues in
Skia code. However, there are places where GL and Vulkan want
pointer values which are explicitly 0, external headers which
use NULL directly, and possibly more uses in un-compiled
sources (for other platforms).
Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345
Reviewed-on: https://skia-review.googlesource.com/39521
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tools/debugger')
-rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 251604e1d9..8cee07f783 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -740,14 +740,14 @@ static void write_png_callback(png_structp png_ptr, png_bytep data, png_size_t l void SkDrawCommand::WritePNG(const uint8_t* rgba, unsigned width, unsigned height, SkWStream& out, bool isOpaque) { - png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); SkASSERT(png != nullptr); png_infop info_ptr = png_create_info_struct(png); SkASSERT(info_ptr != nullptr); if (setjmp(png_jmpbuf(png))) { SK_ABORT("png encode error"); } - png_set_write_fn(png, &out, write_png_callback, NULL); + png_set_write_fn(png, &out, write_png_callback, nullptr); int colorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGBA; png_set_IHDR(png, info_ptr, width, height, 8, colorType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); @@ -770,7 +770,7 @@ void SkDrawCommand::WritePNG(const uint8_t* rgba, unsigned width, unsigned heigh } png_set_filter(png, 0, PNG_NO_FILTERS); png_write_image(png, &rows[0]); - png_destroy_write_struct(&png, NULL); + png_destroy_write_struct(&png, nullptr); sk_free(rows); sk_free(pixels); } |