summaryrefslogtreecommitdiff
path: root/platform/default/image.cpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-14 16:19:15 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-14 22:14:11 +0300
commit6b5caf4b2c5d0beb3271bc0451709c9459341df8 (patch)
treeb6e5b2276f39ee8a4dda7c0e53bf7dc57d3e2940 /platform/default/image.cpp
parent7413061f8e2dde553de2d6bd4021a1c6855fc1b0 (diff)
downloadqtlocation-mapboxgl-6b5caf4b2c5d0beb3271bc0451709c9459341df8.tar.gz
[tidy/linux] modernize-use-nullptr
Diffstat (limited to 'platform/default/image.cpp')
-rw-r--r--platform/default/image.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 0cfcd4100f..d4e42d8a1b 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -30,15 +30,15 @@ std::string encodePNG(const PremultipliedImage& pre) {
UnassociatedImage src = util::unpremultiply(std::move(copy));
- png_voidp error_ptr = 0;
- png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, NULL, NULL);
+ png_voidp error_ptr = nullptr;
+ png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, nullptr, nullptr);
if (!png_ptr) {
throw std::runtime_error("couldn't create png_ptr");
}
png_infop info_ptr = png_create_info_struct(png_ptr);
if (!png_ptr) {
- png_destroy_write_struct(&png_ptr, (png_infopp)0);
+ png_destroy_write_struct(&png_ptr, (png_infopp)nullptr);
throw std::runtime_error("couldn't create info_ptr");
}
@@ -55,7 +55,7 @@ std::string encodePNG(const PremultipliedImage& pre) {
png_set_write_fn(png_ptr, &result, [](png_structp png_ptr_, png_bytep data, png_size_t length) {
std::string *out = static_cast<std::string *>(png_get_io_ptr(png_ptr_));
out->append(reinterpret_cast<char *>(data), length);
- }, NULL);
+ }, nullptr);
struct ptrs {
ptrs(size_t count) : rows(new png_bytep[count]) {}
@@ -68,7 +68,7 @@ std::string encodePNG(const PremultipliedImage& pre) {
}
png_set_rows(png_ptr, info_ptr, pointers.rows);
- png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, nullptr);
png_destroy_write_struct(&png_ptr, &info_ptr);
return result;