RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Added checking for 24bitmap in file.

Browse Source
This commit is contained in:
Foxar
2021-04-21 10:41:32 +02:00
parent b0ae873a88
commit 1090801f4e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/loaders/bmp_loader.cpp
+9 -1
View File
@@ -32,6 +32,7 @@ BmpLoader::~BmpLoader() {}
*/ */
void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *t_extension) void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *t_extension)
{ {
PRINT_LOG("Loading BMP file...");
char *path_part1 = String::createConcatenated(t_subfolder, t_name); char *path_part1 = String::createConcatenated(t_subfolder, t_name);
char *path_part2 = String::createConcatenated("host:", path_part1); char *path_part2 = String::createConcatenated("host:", path_part1);
char *path = String::createConcatenated(path_part2, t_extension); char *path = String::createConcatenated(path_part2, t_extension);
@@ -50,8 +51,15 @@ void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *
u32 width = (u32)header[18]; u32 width = (u32)header[18];
u32 height = (u32)header[22]; u32 height = (u32)header[22];
u32 bits = (u32)header[28];
if (bits != 24)
{
PRINT_ERR("Invalid bits per pixel in .bmp file - expected 24!");
}
o_texture.setSize(width, height, TEX_TYPE_RGB); o_texture.setSize(width, height, TEX_TYPE_RGB);
printf("BMPLoader - width: %d | height: %d\n", width, height); printf("BMPLoader - width: %d | height: %d | bits: %d\n", width, height, bits);
u64 rowPadded = (width * 3 + 3) & (~3); u64 rowPadded = (width * 3 + 3) & (~3);