diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/llimage/llimagedxt.h | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/llimage/llimagedxt.h')
| -rw-r--r-- | indra/llimage/llimagedxt.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llimage/llimagedxt.h b/indra/llimage/llimagedxt.h index 23a5047f0d..b6df098456 100644 --- a/indra/llimage/llimagedxt.h +++ b/indra/llimage/llimagedxt.h @@ -95,15 +95,17 @@ public: protected: /*virtual*/ ~LLImageDXT(); + +private: + BOOL encodeDXT(const LLImageRaw* raw_image, F32 decode_time, bool explicit_mips); public: LLImageDXT(); /*virtual*/ BOOL updateData(); - /*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 time=0.0); - BOOL encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips); - /*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 time=0.0); + /*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time); + /*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time); /*virtual*/ S32 calcHeaderSize(); /*virtual*/ S32 calcDataSize(S32 discard_level = 0); |