aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llimage')
-rw-r--r--linden/indra/llimage/llimagejpeg.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp
index 68529b6..13dea38 100644
--- a/linden/indra/llimage/llimagejpeg.cpp
+++ b/linden/indra/llimage/llimagejpeg.cpp
@@ -465,7 +465,8 @@ void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo )
465 char buffer[JMSG_LENGTH_MAX]; /* Flawfinder: ignore */ 465 char buffer[JMSG_LENGTH_MAX]; /* Flawfinder: ignore */
466 (*cinfo->err->format_message) (cinfo, buffer); 466 (*cinfo->err->format_message) (cinfo, buffer);
467 467
468 ((LLImageJPEG*) cinfo->client_data)->setLastError( buffer ); 468 std::string error = buffer ;
469 LLImage::setLastError(error);
469 470
470 BOOL is_decode = (cinfo->is_decompressor != 0); 471 BOOL is_decode = (cinfo->is_decompressor != 0);
471 llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl; 472 llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl;