aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2014-12-17 19:33:53 +0100
committerraysan5 <raysan5@gmail.com>2014-12-17 19:33:53 +0100
commit1bd592fe67da63b4dc2b149c0701c19f73afb8cc (patch)
tree8886cd4c1acd394f465e7b5445ce0619a7aebe7f
parentdb1ad74ef21dbe48fafc3afc9ba6751832f22b77 (diff)
downloadraylib-1bd592fe67da63b4dc2b149c0701c19f73afb8cc.tar.gz
raylib-1bd592fe67da63b4dc2b149c0701c19f73afb8cc.zip
[texture] image loading small check
-rw-r--r--src/textures.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/textures.c b/src/textures.c
index 1f9ca6ae..8e78ac34 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;
}