summaryrefslogtreecommitdiff
path: root/indra/llkdu/llimagej2ckdu.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-04-04 18:37:32 -0700
committerMerov Linden <merov@lindenlab.com>2011-04-04 18:37:32 -0700
commit83ec0cd62f70888c90671ea91cd056ecb6095bc1 (patch)
tree3bfd13782f0b056e61249f17a057d5bf7ee6f882 /indra/llkdu/llimagej2ckdu.h
parentdc00f42dd7ff59143869e17010ed435db009ae12 (diff)
STORM-746 : add new arguments for precincts and blocks on output, region and level on input, add code for input loading restriction
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.h')
-rw-r--r--indra/llkdu/llimagej2ckdu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 5628f69eeb..8231004f2c 100644
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -58,11 +58,12 @@ protected:
/*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);
+ /*virtual*/ BOOL initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level = -1, int* region = NULL);
private:
+ BOOL initDecode(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, ECodeStreamMode mode, S32 first_channel, S32 max_channel_count, int discard_level = -1, int* region = NULL);
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 );
// Encode variable
LLKDUMemSource *mInputp;