diff options
Diffstat (limited to 'modules/tga')
-rw-r--r-- | modules/tga/SCsub | 4 | ||||
-rw-r--r-- | modules/tga/config.py | 1 | ||||
-rw-r--r-- | modules/tga/image_loader_tga.cpp | 2 | ||||
-rw-r--r-- | modules/tga/register_types.cpp | 2 | ||||
-rw-r--r-- | modules/tga/register_types.h | 5 |
5 files changed, 10 insertions, 4 deletions
diff --git a/modules/tga/SCsub b/modules/tga/SCsub index 7e405f405c..067caa6ea0 100644 --- a/modules/tga/SCsub +++ b/modules/tga/SCsub @@ -1,7 +1,7 @@ #!/usr/bin/env python -Import('env') -Import('env_modules') +Import("env") +Import("env_modules") env_tga = env_modules.Clone() diff --git a/modules/tga/config.py b/modules/tga/config.py index 1c8cd12a2d..d22f9454ed 100644 --- a/modules/tga/config.py +++ b/modules/tga/config.py @@ -1,5 +1,6 @@ def can_build(env, platform): return True + def configure(env): pass diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp index 0e904fdd76..fc9d727bb0 100644 --- a/modules/tga/image_loader_tga.cpp +++ b/modules/tga/image_loader_tga.cpp @@ -283,7 +283,7 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force uint8_t *uncompressed_buffer_w = uncompressed_buffer.ptrw(); const uint8_t *uncompressed_buffer_r; - const uint8_t *buffer = NULL; + const uint8_t *buffer = nullptr; if (is_encoded) { diff --git a/modules/tga/register_types.cpp b/modules/tga/register_types.cpp index 359f4d785e..0d9268ebbf 100644 --- a/modules/tga/register_types.cpp +++ b/modules/tga/register_types.cpp @@ -32,7 +32,7 @@ #include "image_loader_tga.h" -static ImageLoaderTGA *image_loader_tga = NULL; +static ImageLoaderTGA *image_loader_tga = nullptr; void register_tga_types() { diff --git a/modules/tga/register_types.h b/modules/tga/register_types.h index beef05a590..94a77d295e 100644 --- a/modules/tga/register_types.h +++ b/modules/tga/register_types.h @@ -28,5 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef TGA_REGISTER_TYPES_H +#define TGA_REGISTER_TYPES_H + void register_tga_types(); void unregister_tga_types(); + +#endif // TGA_REGISTER_TYPES_H |