mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-24 00:53:47 +00:00
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.
This commit is contained in:
parent
2846fe6e9b
commit
33094397c2
1 changed files with 1 additions and 12 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue