aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimage.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llimage/llimage.h
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to '')
-rw-r--r--linden/indra/llimage/llimage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index ef736ec..8546303 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -268,11 +268,11 @@ public:
268 void appendData(U8 *data, S32 size); 268 void appendData(U8 *data, S32 size);
269 269
270 // Loads first 4 channels. 270 // Loads first 4 channels.
271 virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time=0.0) = 0; 271 virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time) = 0;
272 // Subclasses that can handle more than 4 channels should override this function. 272 // Subclasses that can handle more than 4 channels should override this function.
273 virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time, S32 first_channel, S32 max_channel); 273 virtual BOOL decodeChannels(LLImageRaw* raw_image, F32 decode_time, S32 first_channel, S32 max_channel);
274 274
275 virtual BOOL encode(const LLImageRaw* raw_image, F32 encode_time=0.0) = 0; 275 virtual BOOL encode(const LLImageRaw* raw_image, F32 encode_time) = 0;
276 276
277 S8 getCodec() const; 277 S8 getCodec() const;
278 BOOL isDecoding() const { return mDecoding ? TRUE : FALSE; } 278 BOOL isDecoding() const { return mDecoding ? TRUE : FALSE; }