From 1bd592fe67da63b4dc2b149c0701c19f73afb8cc Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 17 Dec 2014 19:33:53 +0100 Subject: [PATCH] [texture] image loading small check --- src/textures.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/textures.c b/src/textures.c index 1f9ca6ae9..8e78ac346 100644 --- a/src/textures.c +++ b/src/textures.c @@ -128,7 +128,7 @@ Image LoadImage(const char *fileName) TraceLog(INFO, "[%s] Image loaded successfully", fileName); } - else TraceLog(WARNING, "[%s] Image could not be loaded, file format not recognized", fileName); + else TraceLog(WARNING, "[%s] Image could not be loaded, file not recognized", fileName); } else if (strcmp(GetExtension(fileName),"dds") == 0) { @@ -359,7 +359,7 @@ Texture2D LoadTextureFromImage(Image image, bool genMipmaps) texture.width = 0; texture.height = 0; - if (image.pixels != NULL) + if ((image.pixels != NULL) && (image.width > 0) && (image.height > 0)) { unsigned char *imgData = malloc(image.width * image.height * 4); @@ -383,7 +383,7 @@ Texture2D LoadTextureFromImage(Image image, bool genMipmaps) free(imgData); } - else TraceLog(WARNING, "Texture could not be created, image data is not valid"); + else TraceLog(WARNING, "Texture could not be loaded, image data is not valid"); return texture; }