diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
| commit | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (patch) | |
| tree | 0f1aa2cbd03f47adf17f39e6bca8e7d5e4ac165c /indra/llkdu/llimagej2ckdu.h | |
| parent | f1fd558dddf43277e024cb918c371d94d0764910 (diff) | |
| parent | a9686db3e606ec45d23265fd34a1a35498f39857 (diff) | |
merge changes for storm-714
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.h')
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 03f289f8b1..5628f69eeb 100644 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -50,17 +50,16 @@ public: MODE_RESILIENT = 1, MODE_FUSSY = 2 }; - -public: LLImageJ2CKDU(); virtual ~LLImageJ2CKDU(); - + protected: /*virtual*/ BOOL getMetadata(LLImageJ2C &base); /*virtual*/ BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count); /*virtual*/ BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0, BOOL reversible=FALSE); +private: void setupCodeStream(LLImageJ2C &base, BOOL keep_codestream, ECodeStreamMode mode); void cleanupCodeStream(); BOOL initDecode(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, ECodeStreamMode mode, S32 first_channel, S32 max_channel_count ); |