livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-744 : Throw exception consistently so llkdu fails consistently

master
Merov Linden 2010-12-28 18:32:07 -08:00
parent d83314ad3f
commit 5ed4046df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llkdu/llimagej2ckdu.cpp
View File

@ -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;

2
indra/llkdu/tests/llimagej2ckdu_test.cpp
View File

@ -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);
}