From fa70acc5aa63145e7268e1c0d0612bf0463482f2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 17 Dec 2010 22:52:51 -0800 Subject: STORM-744 : Add llkdu unit tests, turn on and fix llworldmap unit tests in newview --- indra/llkdu/llimagej2ckdu.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llkdu/llimagej2ckdu.h') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 03f289f8b1..86ca54491e 100644 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -55,12 +55,13 @@ public: LLImageJ2CKDU(); virtual ~LLImageJ2CKDU(); -protected: +public: /*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); +protected: 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 ); -- cgit v1.2.3 From 0c5bd3675babb0cbe6f3c7312350b71b8229e5d3 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 24 Dec 2010 11:36:15 -0800 Subject: STORM-744 : Took code review into account, moving stuff back in protected or even private, fix things to work in debug mode, some clean up in j2coj also --- indra/llkdu/llimagej2ckdu.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'indra/llkdu/llimagej2ckdu.h') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 86ca54491e..5628f69eeb 100644 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -50,18 +50,16 @@ public: MODE_RESILIENT = 1, MODE_FUSSY = 2 }; - -public: LLImageJ2CKDU(); virtual ~LLImageJ2CKDU(); - -public: + +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); -protected: +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 ); -- cgit v1.2.3