diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimagej2c.h | 12 |
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: | |||
72 | friend class LLImageJ2CImpl; | 72 | friend class LLImageJ2CImpl; |
73 | friend class LLImageJ2COJ; | 73 | friend class LLImageJ2COJ; |
74 | friend class LLImageJ2CKDU; | 74 | friend class LLImageJ2CKDU; |
75 | void setDecodingDone(BOOL complete = TRUE); | 75 | void decodeFailed(); |
76 | void updateRawDiscardLevel(); | 76 | void updateRawDiscardLevel(); |
77 | 77 | ||
78 | S32 mMaxBytes; // Maximum number of bytes of data to use... | 78 | S32 mMaxBytes; // Maximum number of bytes of data to use... |
@@ -87,7 +87,17 @@ class LLImageJ2CImpl | |||
87 | public: | 87 | public: |
88 | virtual ~LLImageJ2CImpl(); | 88 | virtual ~LLImageJ2CImpl(); |
89 | protected: | 89 | protected: |
90 | // Find out the image size and number of channels. | ||
91 | // Return value: | ||
92 | // true: image size and number of channels was determined | ||
93 | // false: error on decode | ||
90 | virtual BOOL getMetadata(LLImageJ2C &base) = 0; | 94 | virtual BOOL getMetadata(LLImageJ2C &base) = 0; |
95 | // Decode the raw image optionally aborting (to continue later) after | ||
96 | // decode_time seconds. Decode at most max_channel_count and start | ||
97 | // decoding channel first_channel. | ||
98 | // Return value: | ||
99 | // true: decoding complete (even if it failed) | ||
100 | // false: time expired while decoding | ||
91 | virtual BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count) = 0; | 101 | virtual BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count) = 0; |
92 | virtual BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0) = 0; | 102 | virtual BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0) = 0; |
93 | 103 | ||