aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimage.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llimage/llimage.h
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r--linden/indra/llimage/llimage.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 199dc07..0393d13 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -60,7 +60,7 @@ class LLImageFormatted;
60class LLImageRaw; 60class LLImageRaw;
61class LLColor4U; 61class LLColor4U;
62 62
63enum 63typedef enum e_image_codec
64{ 64{
65 IMG_CODEC_INVALID = 0, 65 IMG_CODEC_INVALID = 0,
66 IMG_CODEC_RGB = 1, 66 IMG_CODEC_RGB = 1,
@@ -71,7 +71,7 @@ enum
71 IMG_CODEC_DXT = 6, 71 IMG_CODEC_DXT = 6,
72 IMG_CODEC_PNG = 7, 72 IMG_CODEC_PNG = 7,
73 IMG_CODEC_EOF = 8 73 IMG_CODEC_EOF = 8
74}; 74} EImageCodec;
75 75
76//============================================================================ 76//============================================================================
77 77
@@ -125,6 +125,8 @@ public:
125 125
126 static void setSizeOverride(BOOL enabled) { sSizeOverride = enabled; } 126 static void setSizeOverride(BOOL enabled) { sSizeOverride = enabled; }
127 127
128 static EImageCodec getCodecFromExtension(const LLString& exten);
129
128private: 130private:
129 U8 *mData; 131 U8 *mData;
130 S32 mDataSize; 132 S32 mDataSize;