diff options
author | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
commit | 31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch) | |
tree | c4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llimage/llimagej2c.cpp | |
parent | Second Life viewer sources 1.19.1.1 (diff) | |
download | meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2 meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz |
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/llimage/llimagej2c.cpp')
-rw-r--r-- | linden/indra/llimage/llimagej2c.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp index 0011296..9de4d5f 100644 --- a/linden/indra/llimage/llimagej2c.cpp +++ b/linden/indra/llimage/llimagej2c.cpp | |||
@@ -250,11 +250,11 @@ BOOL LLImageJ2C::updateData() | |||
250 | 250 | ||
251 | BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time) | 251 | BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time) |
252 | { | 252 | { |
253 | return decode(raw_imagep, decode_time, 0, 4); | 253 | return decodeChannels(raw_imagep, decode_time, 0, 4); |
254 | } | 254 | } |
255 | 255 | ||
256 | 256 | ||
257 | BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count ) | 257 | BOOL LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count ) |
258 | { | 258 | { |
259 | LLMemType mt1((LLMemType::EMemType)mMemType); | 259 | LLMemType mt1((LLMemType::EMemType)mMemType); |
260 | 260 | ||