diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-03-27 19:15:08 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-03-27 19:15:08 +0200 |
| commit | 8fa339612681ef501a3c74db8e5845cbfffbf2b8 (patch) | |
| tree | f54fb2e13d3743184728244505da1cad6b730b33 | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: improving stability
| -rwxr-xr-x | indra/llimage/llimageworker.cpp | 4 | ||||
| -rwxr-xr-x | indra/llimage/tests/llimageworker_test.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index e425823c59..148cf4fa55 100755 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -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; diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index e255d65b43..f6fb8f54b4 100755 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -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() { } |