From ea49543542ae063fec292dc3e6607f16cc1fb89a Mon Sep 17 00:00:00 2001 From: Foxar Date: Fri, 23 Apr 2021 15:36:44 +0200 Subject: [PATCH 1/2] Added offset to pixel data reading in bmp_loader --- src/engine/loaders/bmp_loader.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/engine/loaders/bmp_loader.cpp b/src/engine/loaders/bmp_loader.cpp index ef42aad..1b3df69 100644 --- a/src/engine/loaders/bmp_loader.cpp +++ b/src/engine/loaders/bmp_loader.cpp @@ -51,6 +51,7 @@ void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * u32 width = (u32)header[18]; u32 height = (u32)header[22]; u32 bits = (u32)header[28]; + u32 dataOffset = (u32)header[10]; if (bits != 24) { @@ -64,6 +65,9 @@ void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * unsigned char row[rowPadded]; + //Offset file stream to raster data + //fseek(file, dataOffset, SEEK_SET); + u32 x = 0; for (u32 i = 0; i < height; i++) { From 247e71a4078d08ee18e08f2e40570169f134700e Mon Sep 17 00:00:00 2001 From: Foxar Date: Fri, 23 Apr 2021 15:44:54 +0200 Subject: [PATCH 2/2] Oops, uncommented function that was commented by accident. --- src/engine/loaders/bmp_loader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/loaders/bmp_loader.cpp b/src/engine/loaders/bmp_loader.cpp index 1b3df69..c6d60d7 100644 --- a/src/engine/loaders/bmp_loader.cpp +++ b/src/engine/loaders/bmp_loader.cpp @@ -66,7 +66,7 @@ void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * unsigned char row[rowPadded]; //Offset file stream to raster data - //fseek(file, dataOffset, SEEK_SET); + fseek(file, dataOffset, SEEK_SET); u32 x = 0; for (u32 i = 0; i < height; i++)