Skip to content
Snippets Groups Projects
Commit eea1057b authored by Steve Bennetts's avatar Steve Bennetts
Browse files

EXT-2215 - Viewer crashes while trying to decode image

llwarns is not entirely thread safe. Need to fix that, but for now, use LL_DEBUGS instead.
parent f3bbcfb9
No related branches found
No related tags found
No related merge requests found
...@@ -168,7 +168,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod ...@@ -168,7 +168,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
// dereference the array. // dereference the array.
if(!image || !image->numcomps) if(!image || !image->numcomps)
{ {
llwarns << "ERROR -> decodeImpl: failed to decode image!" << llendl; LL_DEBUGS("Texture") << "ERROR -> decodeImpl: failed to decode image!" << LL_ENDL;
if (image) if (image)
{ {
opj_image_destroy(image); opj_image_destroy(image);
...@@ -241,7 +241,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod ...@@ -241,7 +241,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
} }
else // Some rare OpenJPEG versions have this bug. else // Some rare OpenJPEG versions have this bug.
{ {
llwarns << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl; LL_DEBUGS("Texture") << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << LL_ENDL;
opj_image_destroy(image); opj_image_destroy(image);
return TRUE; // done return TRUE; // done
...@@ -375,7 +375,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con ...@@ -375,7 +375,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
if (!bSuccess) if (!bSuccess)
{ {
opj_cio_close(cio); opj_cio_close(cio);
llinfos << "Failed to encode image." << llendl; LL_DEBUGS("Texture") << "Failed to encode image." << LL_ENDL;
return FALSE; return FALSE;
} }
codestream_length = cio_tell(cio); codestream_length = cio_tell(cio);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment