diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
| commit | 68b62747edb7073dd3f4975e2b38388ae80d801c (patch) | |
| tree | 73730fdc31d3d74a2ba69ad156217299115cd810 /indra/llkdu/llimagej2ckdu.cpp | |
| parent | a1afe50feb1c42cc21c7f89b4187a8f7abe0c9fc (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.cpp')
| -rwxr-xr-x | indra/llkdu/llimagej2ckdu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 0c0a844b73..6a8959517d 100755 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -156,22 +156,22 @@ public: void LLKDUMessageWarning::put_text(const char *s) { - llinfos << "KDU Warning: " << s << llendl; + LL_INFOS() << "KDU Warning: " << s << LL_ENDL; } void LLKDUMessageWarning::put_text(const kdu_uint16 *s) { - llinfos << "KDU Warning: " << s << llendl; + LL_INFOS() << "KDU Warning: " << s << LL_ENDL; } void LLKDUMessageError::put_text(const char *s) { - llinfos << "KDU Error: " << s << llendl; + LL_INFOS() << "KDU Error: " << s << LL_ENDL; } void LLKDUMessageError::put_text(const kdu_uint16 *s) { - llinfos << "KDU Error: " << s << llendl; + LL_INFOS() << "KDU Error: " << s << LL_ENDL; } void LLKDUMessageError::flush(bool end_of_message) @@ -290,7 +290,7 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, BOOL keep_codestream, ECod kdu_dims dims2; mCodeStreamp->get_dims(2,dims2); if ((dims1 != dims) || (dims2 != dims)) { - llerrs << "Components don't have matching dimensions!" << llendl; + LL_ERRS() << "Components don't have matching dimensions!" << LL_ENDL; } } @@ -393,7 +393,7 @@ BOOL LLImageJ2CKDU::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, F32 deco region_kdu->size.y = region[3] - region[1]; } int discard = (discard_level != -1 ? discard_level : base.getRawDiscardLevel()); - //llinfos << "Merov debug : initDecode, discard used = " << discard << ", asked = " << discard_level << llendl; + //LL_INFOS() << "Merov debug : initDecode, discard used = " << discard << ", asked = " << discard_level << LL_ENDL; // Apply loading restrictions mCodeStreamp->apply_input_restrictions( first_channel, max_channel_count, discard, 0, region_kdu); |