diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/llimage/llimagej2c.cpp | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
| -rw-r--r-- | indra/llimage/llimagej2c.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 398e7c9e32..1f345e9d04 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -132,7 +132,9 @@ void LLImageJ2C::closeDSO() LLImageJ2C::LLImageJ2C() : LLImageFormatted(IMG_CODEC_J2C), mMaxBytes(0), mRawDiscardLevel(-1), - mRate(0.0f) + mRate(0.0f), + mReversible(FALSE) + { //We assume here that if we wanted to destory via //a dynamic library that the approriate open calls were made @@ -252,7 +254,7 @@ BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, F32 encode_time) BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time) { LLMemType mt1((LLMemType::EMemType)mMemType); - return mImpl->encodeImpl(*this, *raw_imagep, comment_text, encode_time); + return mImpl->encodeImpl(*this, *raw_imagep, comment_text, encode_time, mReversible); } //static @@ -321,11 +323,11 @@ void LLImageJ2C::setMaxBytes(S32 max_bytes) { mMaxBytes = max_bytes; } -// NOT USED -// void LLImageJ2C::setReversible(const BOOL reversible) -// { -// mReversible = reversible; -// } + +void LLImageJ2C::setReversible(const BOOL reversible) +{ + mReversible = reversible; +} BOOL LLImageJ2C::loadAndValidate(const LLString &filename) |