TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1246 from marauder2k9-torque/stb-console-spam

Browse source 
Update bitmapSTB.cpp
This commit is contained in:
Brian Roberts 2024-03-27 02:38:02 -05:00 • committed by GitHub
commit 548796af01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp
View file

@ -328,19 +328,8 @@ bool sReadStreamSTB(Stream& stream, GBitmap* bitmap, U32 len)
stream.read(len, data); stream.read(len, data);
S32 width, height, comp = 0; S32 width, height, comp = 0;
if (stbi_info_from_memory(data, len, &width, &height, &comp))
{
const char* stbErr = stbi_failure_reason();
if (!stbErr) unsigned char* pixelData = stbi_load_from_memory((const U8*)data, (int)len, &width, &height, &comp, 0);
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);
if (!pixelData) if (!pixelData)
{ {