diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-14 16:19:15 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-14 22:14:11 +0300 |
commit | 6b5caf4b2c5d0beb3271bc0451709c9459341df8 (patch) | |
tree | b6e5b2276f39ee8a4dda7c0e53bf7dc57d3e2940 /platform/default/png_reader.cpp | |
parent | 7413061f8e2dde553de2d6bd4021a1c6855fc1b0 (diff) | |
download | qtlocation-mapboxgl-6b5caf4b2c5d0beb3271bc0451709c9459341df8.tar.gz |
[tidy/linux] modernize-use-nullptr
Diffstat (limited to 'platform/default/png_reader.cpp')
-rw-r--r-- | platform/default/png_reader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp index 821004922e..3d1165b13f 100644 --- a/platform/default/png_reader.cpp +++ b/platform/default/png_reader.cpp @@ -46,7 +46,7 @@ struct png_struct_guard { i_(info_ptr_ptr) {} ~png_struct_guard() { - png_destroy_read_struct(p_,i_,0); + png_destroy_read_struct(p_,i_,nullptr); } png_structpp p_; @@ -66,7 +66,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) { if (!is_png) throw std::runtime_error("File or stream is not a png"); - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); if (!png_ptr) throw std::runtime_error("failed to allocate png_ptr"); @@ -87,7 +87,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) { png_uint_32 height = 0; int bit_depth = 0; int color_type = 0; - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr); UnassociatedImage image { width, height }; @@ -125,7 +125,7 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) { rows[row] = image.data.get() + row * width * 4; png_read_image(png_ptr, rows.get()); - png_read_end(png_ptr, 0); + png_read_end(png_ptr, nullptr); return util::premultiply(std::move(image)); } |