diff options
Diffstat (limited to 'linden/indra/llimage/llimagej2c.cpp')
-rw-r--r-- | linden/indra/llimage/llimagej2c.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp index b116027..305b11d 100644 --- a/linden/indra/llimage/llimagej2c.cpp +++ b/linden/indra/llimage/llimagej2c.cpp | |||
@@ -152,7 +152,9 @@ void LLImageJ2C::closeDSO() | |||
152 | LLImageJ2C::LLImageJ2C() : LLImageFormatted(IMG_CODEC_J2C), | 152 | LLImageJ2C::LLImageJ2C() : LLImageFormatted(IMG_CODEC_J2C), |
153 | mMaxBytes(0), | 153 | mMaxBytes(0), |
154 | mRawDiscardLevel(-1), | 154 | mRawDiscardLevel(-1), |
155 | mRate(0.0f) | 155 | mRate(0.0f), |
156 | mReversible(FALSE) | ||
157 | |||
156 | { | 158 | { |
157 | //We assume here that if we wanted to destory via | 159 | //We assume here that if we wanted to destory via |
158 | //a dynamic library that the approriate open calls were made | 160 | //a dynamic library that the approriate open calls were made |
@@ -272,7 +274,7 @@ BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, F32 encode_time) | |||
272 | BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time) | 274 | BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time) |
273 | { | 275 | { |
274 | LLMemType mt1((LLMemType::EMemType)mMemType); | 276 | LLMemType mt1((LLMemType::EMemType)mMemType); |
275 | return mImpl->encodeImpl(*this, *raw_imagep, comment_text, encode_time); | 277 | return mImpl->encodeImpl(*this, *raw_imagep, comment_text, encode_time, mReversible); |
276 | } | 278 | } |
277 | 279 | ||
278 | //static | 280 | //static |
@@ -341,11 +343,11 @@ void LLImageJ2C::setMaxBytes(S32 max_bytes) | |||
341 | { | 343 | { |
342 | mMaxBytes = max_bytes; | 344 | mMaxBytes = max_bytes; |
343 | } | 345 | } |
344 | // NOT USED | 346 | |
345 | // void LLImageJ2C::setReversible(const BOOL reversible) | 347 | void LLImageJ2C::setReversible(const BOOL reversible) |
346 | // { | 348 | { |
347 | // mReversible = reversible; | 349 | mReversible = reversible; |
348 | // } | 350 | } |
349 | 351 | ||
350 | 352 | ||
351 | BOOL LLImageJ2C::loadAndValidate(const LLString &filename) | 353 | BOOL LLImageJ2C::loadAndValidate(const LLString &filename) |