diff options
| author | Richard Linden <none@none> | 2011-05-09 11:55:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-09 11:55:47 -0700 |
| commit | e1f2b2b3e82a2415abe9d2c0e548319284e0f2bf (patch) | |
| tree | 9af4e7f3950c1859d6757a933d827d60205e925f /indra/llimage/llimagej2c.cpp | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
| parent | 1e0d3fc7bc1102faaa98ea6753c4366d9cef7379 (diff) | |
Automated merge with bundle:F:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.4vsiw5\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_qwnptv.hg
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) |