diff options
author | Jacek Antonelli | 2009-01-11 16:10:10 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-11 16:10:15 -0600 |
commit | 6156baad67c744ed03ea47798bfeb8a77698efc6 (patch) | |
tree | 872d35ff6df740462d8cb574d03f746dfd5dd1ae /linden/indra/llimage/llimagejpeg.cpp | |
parent | Second Life viewer sources 1.22.3-RC (diff) | |
download | meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.zip meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.gz meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.bz2 meta-impy-6156baad67c744ed03ea47798bfeb8a77698efc6.tar.xz |
Second Life viewer sources 1.22.4-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimagejpeg.cpp | 3 |
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; |