diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-30 16:30:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-30 16:30:36 -0500 |
| commit | e68b03260ffdf786f609ace72ba1f63ce0913b2c (patch) | |
| tree | fd801ec06335331dc03638eb670a7cae2e10a471 /indra/llkdu/llimagej2ckdu.h | |
| parent | fad456e2b13fab83206240d7973dd2529b53de9e (diff) | |
| parent | cc3f0d287c7edb9e4cfe18985f2758e815502440 (diff) | |
Automated merge up 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 ); |