diff options
| author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
| commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
| tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/llimage/llimagejpeg.cpp | |
| parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
| parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) | |
merge
Diffstat (limited to 'indra/llimage/llimagejpeg.cpp')
| -rwxr-xr-x | indra/llimage/llimagejpeg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp index b70f84efc8..a25794dab4 100755 --- a/indra/llimage/llimagejpeg.cpp +++ b/indra/llimage/llimagejpeg.cpp @@ -374,7 +374,7 @@ boolean LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo ) U8* new_buffer = new U8[ new_buffer_size ]; if (!new_buffer) { - llerrs << "Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )" << llendl; + LL_ERRS() << "Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )" << LL_ENDL; return FALSE; } memcpy( new_buffer, self->mOutputBuffer, self->mOutputBufferSize ); /* Flawfinder: ignore */ @@ -465,7 +465,7 @@ void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo ) LLImage::setLastError(error); BOOL is_decode = (cinfo->is_decompressor != 0); - llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl; + LL_WARNS() << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << LL_ENDL; } BOOL LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time ) |