diff options
| author | lupoDharkael <izhe@hotmail.es> | 2020-04-02 01:20:12 +0200 |
|---|---|---|
| committer | lupoDharkael <izhe@hotmail.es> | 2020-04-02 13:38:00 +0200 |
| commit | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (patch) | |
| tree | be0cd59e5a90926e9d653fed9f3b1b77e735ca2f /modules/bmp | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
Replace NULL with nullptr
Diffstat (limited to 'modules/bmp')
| -rw-r--r-- | modules/bmp/image_loader_bmp.cpp | 4 | ||||
| -rw-r--r-- | modules/bmp/register_types.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/bmp/image_loader_bmp.cpp b/modules/bmp/image_loader_bmp.cpp index 71e5076e78..ea2b2b548f 100644 --- a/modules/bmp/image_loader_bmp.cpp +++ b/modules/bmp/image_loader_bmp.cpp @@ -38,7 +38,7 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image, Error err = OK; - if (p_buffer == NULL) + if (p_buffer == nullptr) err = FAILED; if (err == OK) { @@ -151,7 +151,7 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image, line -= line_width; } - if (p_color_buffer == NULL || color_table_size == 0) { // regular pixels + if (p_color_buffer == nullptr || color_table_size == 0) { // regular pixels p_image->create(width, height, 0, Image::FORMAT_RGBA8, data); diff --git a/modules/bmp/register_types.cpp b/modules/bmp/register_types.cpp index d5cc6c5eb3..6220e956d6 100644 --- a/modules/bmp/register_types.cpp +++ b/modules/bmp/register_types.cpp @@ -32,7 +32,7 @@ #include "image_loader_bmp.h" -static ImageLoaderBMP *image_loader_bmp = NULL; +static ImageLoaderBMP *image_loader_bmp = nullptr; void register_bmp_types() { image_loader_bmp = memnew(ImageLoaderBMP); |