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/llimagebmp.cpp | |
| parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
| parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) | |
merge
Diffstat (limited to 'indra/llimage/llimagebmp.cpp')
| -rwxr-xr-x | indra/llimage/llimagebmp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp index 60b1c628d7..8573fe0d91 100755 --- a/indra/llimage/llimagebmp.cpp +++ b/indra/llimage/llimagebmp.cpp @@ -321,7 +321,7 @@ BOOL LLImageBMP::updateData() mColorPalette = new U8[color_palette_size]; if (!mColorPalette) { - llerrs << "Out of memory in LLImageBMP::updateData()" << llendl; + LL_ERRS() << "Out of memory in LLImageBMP::updateData()" << LL_ENDL; return FALSE; } memcpy( mColorPalette, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE + extension_size, color_palette_size ); /* Flawfinder: ignore */ @@ -528,7 +528,7 @@ BOOL LLImageBMP::encode(const LLImageRaw* raw_image, F32 encode_time) if( (2 == src_components) || (4 == src_components) ) { - llinfos << "Dropping alpha information during BMP encoding" << llendl; + LL_INFOS() << "Dropping alpha information during BMP encoding" << LL_ENDL; } setSize(raw_image->getWidth(), raw_image->getHeight(), dst_components); |