Second Life viewer sources 1.14.0.0

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index a6894ab..24a1429 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -72,7 +72,7 @@ protected:
         friend class LLImageJ2CImpl;
         friend class LLImageJ2COJ;
         friend class LLImageJ2CKDU;
-        void setDecodingDone(BOOL complete = TRUE);
+        void decodeFailed();
         void updateRawDiscardLevel();
 
         S32 mMaxBytes; // Maximum number of bytes of data to use...
@@ -87,7 +87,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;