[tidy/linux] modernize-use-nullptr

This commit is contained in:
Bruno de Oliveira Abinader
2016-06-14 16:19:15 +03:00
parent 7413061f8e
commit 6b5caf4b2c
6 changed files with 21 additions and 21 deletions

View File

@@ -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;