diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
| commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
| tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/llimage/llimagej2c.cpp | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
| -rw-r--r-- | indra/llimage/llimagej2c.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index d4c08ca377..32a8c60fac 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -224,7 +224,7 @@ BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_chann // Update the raw discard level updateRawDiscardLevel(); - return mImpl->decodeImpl(*this, *raw_imagep, decode_time, 0, 4); + return mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count); } |