diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-04-10 22:07:06 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-04-10 23:22:20 +0200 |
| commit | 7c8e7c6b6e16d4a26259a676db32d8776b99817e (patch) | |
| tree | 99f134b7e66367cf11e10bc5061896eab4a3264f /src/os/macosx/splash.cpp | |
| parent | 3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff) | |
| download | openttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz | |
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/os/macosx/splash.cpp')
| -rw-r--r-- | src/os/macosx/splash.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/os/macosx/splash.cpp b/src/os/macosx/splash.cpp index eadb78510..1ddb165b3 100644 --- a/src/os/macosx/splash.cpp +++ b/src/os/macosx/splash.cpp @@ -54,7 +54,7 @@ static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message) void DisplaySplashImage() { FILE *f = FioFOpenFile(SPLASH_IMAGE_FILE, "r", BASESET_DIR); - if (f == NULL) return; + if (f == nullptr) return; png_byte header[8]; fread(header, sizeof(png_byte), 8, f); @@ -63,23 +63,23 @@ void DisplaySplashImage() return; } - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp) NULL, png_my_error, png_my_warning); + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp) nullptr, png_my_error, png_my_warning); - if (png_ptr == NULL) { + if (png_ptr == nullptr) { fclose(f); return; } png_infop info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) { - png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + if (info_ptr == nullptr) { + png_destroy_read_struct(&png_ptr, (png_infopp)nullptr, (png_infopp)nullptr); fclose(f); return; } png_infop end_info = png_create_info_struct(png_ptr); - if (end_info == NULL) { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if (end_info == nullptr) { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)nullptr); fclose(f); return; } @@ -93,7 +93,7 @@ void DisplaySplashImage() png_init_io(png_ptr, f); png_set_sig_bytes(png_ptr, 8); - png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, nullptr); uint width = png_get_image_width(png_ptr, info_ptr); uint height = png_get_image_height(png_ptr, info_ptr); |