diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
| commit | 6f5313caea9bb8458dca23bbaf4f10cd6641c7fb (patch) | |
| tree | ac34191250860e5f250cf1cc2e9199cdaa8204f6 /indra/llimage/llimagej2c.cpp | |
| parent | eb8221338e0276b9afe8d92738166f97782d48d6 (diff) | |
| parent | 0b612741d53a044a0179e1c32018bf8cd4213631 (diff) | |
automated merge mesh-development -> davep-mesh-candidate-2010
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
| -rw-r--r-- | indra/llimage/llimagej2c.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index a90df0f1c1..44e6b89dd3 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -144,9 +144,9 @@ BOOL LLImageJ2C::initDecode(LLImageRaw &raw_image, int discard_level, int* regio return mImpl->initDecode(*this,raw_image,discard_level,region); } -BOOL LLImageJ2C::initEncode(LLImageRaw &raw_image, int blocks_size, int precincts_size) +BOOL LLImageJ2C::initEncode(LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels) { - return mImpl->initEncode(*this,raw_image,blocks_size,precincts_size); + return mImpl->initEncode(*this,raw_image,blocks_size,precincts_size,levels); } BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time) |