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

STORM-744 : Make getMetaData pass when all is stubbed

master
Merov Linden 2010-12-28 20:00:06 -08:00
parent 5ed4046df5
commit bf1d42ff96
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llkdu/llimagej2ckdu.cpp
View File

@ -229,16 +229,17 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, BOOL keep_codestream, ECod
mCodeStreamp = NULL;
}
if (!mInputp)
if (!mInputp && base.getData())
{
llassert_always(base.getData());
// The compressed data has been loaded
// Setup the source for the codestrea
// Setup the source for the codestream
mInputp = new LLKDUMemSource(base.getData(), data_size);
}
llassert_always(mInputp);
mInputp->reset();
if (mInputp)
{
mInputp->reset();
}
mCodeStreamp = new kdu_codestream;
mCodeStreamp->create(mInputp);

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

@ -219,8 +219,9 @@ namespace tut
{
LLImageJ2C* image = new LLImageJ2C();
BOOL res = mImage->callGetMetadata(*image);
// 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);
// Trying to set up a data stream with all NIL values and stubbed KDU will "work" and return TRUE
// Note that is linking with KDU, that call will throw an exception and fail, returning FALSE
ensure("getMetadata() test failed", res == TRUE);
}
// Test 2 : test decodeImpl()