diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:15:59 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:15:59 -0500 |
| commit | 678e8621794e774dc6ecc14b9fc3628583e4b935 (patch) | |
| tree | c9d351d469f65968e3cfb0ba9973170c8dd67a03 /indra | |
| parent | 6a50342c6a4b6f65659719af7580a8cb34e28bf7 (diff) | |
Backed out changeset: de0a65947c60
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llimage/llimageworker.cpp | 4 | ||||
| -rwxr-xr-x | indra/llimage/tests/llimageworker_test.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 148cf4fa55..e425823c59 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 f6fb8f54b4..e255d65b43 100755 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -58,7 +58,6 @@ 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() { } |