livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: improving stability

meow-7.2.2
maksymsproductengine 2014-03-27 19:15:08 +02:00
parent 5c20e06dbd
commit 8fa3396126
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llimage/llimageworker.cpp
View File

@ -143,7 +143,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
mFormattedImage->getComponents());
}
//if (mDecodedImageRaw->getData()))
if (mDecodedImageRaw->getData())
{
done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms
mDecodedRaw = done;
@ -159,7 +159,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
1);
}
//if (mDecodedImageAux->getData())
if (mDecodedImageAux->getData())
{
done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms
mDecodedAux = done;

1
indra/llimage/tests/llimageworker_test.cpp
View File

@ -58,6 +58,7 @@ void LLImageBase::sanityCheck() { }
void LLImageBase::deleteData() { }
U8* LLImageBase::allocateData(S32 size) { return NULL; }
U8* LLImageBase::reallocateData(S32 size) { return NULL; }
U8* LLImageBase::getData() { return NULL; }
LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) { }
LLImageRaw::~LLImageRaw() { }