diff options
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 4 | ||||
| -rw-r--r-- | indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index efa75e4ebd..c0db63a85b 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -231,13 +231,13 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, BOOL keep_codestream, ECod if (!mInputp) { - llassert(base.getData()); + llassert_always(base.getData()); // The compressed data has been loaded // Setup the source for the codestrea mInputp = new LLKDUMemSource(base.getData(), data_size); } - llassert(mInputp); + llassert_always(mInputp); mInputp->reset(); mCodeStreamp = new kdu_codestream; diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 10f4ceb9ef..b3c3da20e2 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -219,7 +219,7 @@ namespace tut { LLImageJ2C* image = new LLImageJ2C(); BOOL res = mImage->callGetMetadata(*image); - // Trying to set up a data stream with all NIL values will fail and return FALSE + // Trying to set up a data stream with all NIL values will throw an exception that will be caught and will return FALSE ensure("getMetadata() test failed", res == FALSE); } |