From 33094397c271a74c54cbc9c0cf27a4e35303e553 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 27 Mar 2024 07:32:59 +0000 Subject: [PATCH] Update bitmapSTB.cpp stb loader was spamming NO SOI with the function of stbi_info_from_memory because it checks for a jpeg first. This will always return an error if you are sending any other format. Remove this check and just load the memory stream. if it fails to return pixeldata then we have an error. --- Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp b/Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp index d4a6455b4..7a763cd27 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp @@ -328,19 +328,8 @@ bool sReadStreamSTB(Stream& stream, GBitmap* bitmap, U32 len) stream.read(len, data); S32 width, height, comp = 0; - if (stbi_info_from_memory(data, len, &width, &height, &comp)) - { - const char* stbErr = stbi_failure_reason(); - if (!stbErr) - stbErr = "Unknown Error!"; - - Con::errorf("STB get memory info: %s", stbErr); - } - - S32 reqCom = comp; - - unsigned char* pixelData = stbi_load_from_memory((const U8*)data, (int)len, &width, &height, &comp, reqCom); + unsigned char* pixelData = stbi_load_from_memory((const U8*)data, (int)len, &width, &height, &comp, 0); if (!pixelData) {