summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2007-03-16 11:39:49 +0000
committerAdam Moss <moss@lindenlab.com>2007-03-16 11:39:49 +0000
commit9d3309f6847a7406b2094201174cfa718cd60aa9 (patch)
tree2989404c0e1d020ecd08669e7a20db96d7559797 /indra/llimage
parent0947e139ed57685d24667a362ad0e13b7df13509 (diff)
SL-35314 - fix many openjpeg woes. QA'd.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887 --> release
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimagej2c.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h
index 1181ae2bb8..8a832677a3 100644
--- a/indra/llimage/llimagej2c.h
+++ b/indra/llimage/llimagej2c.h
@@ -68,7 +68,17 @@ class LLImageJ2CImpl
public:
virtual ~LLImageJ2CImpl();
protected:
+ // Find out the image size and number of channels.
+ // Return value:
+ // true: image size and number of channels was determined
+ // false: error on decode
virtual BOOL getMetadata(LLImageJ2C &base) = 0;
+ // Decode the raw image optionally aborting (to continue later) after
+ // decode_time seconds. Decode at most max_channel_count and start
+ // decoding channel first_channel.
+ // Return value:
+ // true: decoding complete (even if it failed)
+ // false: time expired while decoding
virtual BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count) = 0;
virtual BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0) = 0;