diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2008-09-05 22:03:35 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2008-09-05 22:03:35 +0000 |
| commit | 222bca24c12e162669c1a810c3102811f21cfbe4 (patch) | |
| tree | 8eee52c0ffd4e9b03d624fc78d6547b8312a5c85 /indra/llimage/llimagej2c.h | |
| parent | 1493a212629b02a4323bf0c1f5a6960bc7b5e271 (diff) | |
svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
this is a combined mergeback of the following branches as per QAR-841:
maint-server/maint-server-1 (absorbed by maint-server-2)
maint-server/maint-server-2
maint-server/maint-server-3
havok4/havok4-8
havok4/havok4-9
yes dataserver-is-deprecated
Diffstat (limited to 'indra/llimage/llimagej2c.h')
| -rw-r--r-- | indra/llimage/llimagej2c.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h index 03172d344f..4dc39ccc36 100644 --- a/indra/llimage/llimagej2c.h +++ b/indra/llimage/llimagej2c.h @@ -54,6 +54,10 @@ public: /*virtual*/ S32 calcDataSize(S32 discard_level = 0); /*virtual*/ S32 calcDiscardLevelBytes(S32 bytes); /*virtual*/ S8 getRawDiscardLevel(); + // Override these so that we don't try to set a global variable from a DLL + /*virtual*/ void resetLastError(); + /*virtual*/ void setLastError(const std::string& message, const std::string& filename = std::string()); + // Encode with comment text BOOL encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time=0.0); @@ -86,6 +90,7 @@ protected: F32 mRate; BOOL mReversible; LLImageJ2CImpl *mImpl; + std::string mLastError; }; // Derive from this class to implement JPEG2000 decoding |