diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/llkdu/llimagej2ckdu.h | |
parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) |
Merge from viewer-development
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 ); |