diff options
| author | raysan5 <[email protected]> | 2021-07-28 19:47:53 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2021-07-28 19:47:53 +0200 |
| commit | 96aadec503580fdb47fb5e43d324736315ea6e8e (patch) | |
| tree | d4f31d208316fb5a61751193ba5f3114526ccfc1 /src | |
| parent | c219fc02cd67d5831a1174f8cbf001e81b18ae8e (diff) | |
| download | raylib-96aadec503580fdb47fb5e43d324736315ea6e8e.tar.gz raylib-96aadec503580fdb47fb5e43d324736315ea6e8e.zip | |
REVIEWED: Info on image loading failure
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlgl.h | 2 | ||||
| -rw-r--r-- | src/textures.c | 18 |
2 files changed, 12 insertions, 8 deletions
@@ -3760,7 +3760,7 @@ const char *rlGetPixelFormatName(unsigned int format) case PIXELFORMAT_COMPRESSED_PVRT_RGBA: return "PVRT_RGBA"; break; // 4 bpp case PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: return "ASTC_4x4_RGBA"; break; // 8 bpp case PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: return "ASTC_8x8_RGBA"; break; // 2 bpp - default: return "\0"; break; + default: return "UNKNOWN"; break; } } diff --git a/src/textures.c b/src/textures.c index 7e986e2a..94da3c8c 100644 --- a/src/textures.c +++ b/src/textures.c @@ -331,12 +331,15 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i int comp = 0; image.data = stbi_load_from_memory(fileData, dataSize, &image.width, &image.height, &comp, 0); - image.mipmaps = 1; + if (image.data != NULL) + { + image.mipmaps = 1; - if (comp == 1) image.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE; - else if (comp == 2) image.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA; - else if (comp == 3) image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8; - else if (comp == 4) image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; + if (comp == 1) image.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE; + else if (comp == 2) image.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA; + else if (comp == 3) image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8; + else if (comp == 4) image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; + } } #endif } @@ -380,8 +383,9 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i #endif else TRACELOG(LOG_WARNING, "IMAGE: Data format not supported"); - TRACELOG(LOG_INFO, "IMAGE: Data loaded successfully (%ix%i | %s | %i mipmaps)", image.width, image.height, rlGetPixelFormatName(image.format), image.mipmaps); - + if (image.data != NULL) TRACELOG(LOG_INFO, "IMAGE: Data loaded successfully (%ix%i | %s | %i mipmaps)", image.width, image.height, rlGetPixelFormatName(image.format), image.mipmaps); + else TRACELOG(LOG_WARNING, "IMAGE: Failed to load image data"); + return image; } |