summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-13 13:28:51 -0400
committerOz Linden <oz@lindenlab.com>2011-05-13 13:28:51 -0400
commit66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch)
treea1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/llimagej2coj/llimagej2coj.h
parent27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff)
parente8ede07451c65aea898bc3f58a980b6b0d9af302 (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.h')
-rw-r--r--indra/llimagej2coj/llimagej2coj.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h
index 9476665ccb..9c7cc09fcb 100644
--- a/indra/llimagej2coj/llimagej2coj.h
+++ b/indra/llimagej2coj/llimagej2coj.h
@@ -39,6 +39,8 @@ 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);
+ /*virtual*/ BOOL initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size = -1, int precincts_size = -1);
};
#endif