aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:59 -0500
committerJacek Antonelli2008-08-15 23:44:59 -0500
commita408bac29378072fbf36864164149458c978cfcc (patch)
tree67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/llimage
parentSecond Life viewer sources 1.17.0.12 (diff)
downloadmeta-impy-a408bac29378072fbf36864164149458c978cfcc.zip
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/llimage')
-rw-r--r--linden/indra/llimage/files.lst2
-rw-r--r--linden/indra/llimage/llimage.cpp3
-rw-r--r--linden/indra/llimage/llimage.h3
-rw-r--r--linden/indra/llimage/llimage.vcproj12
-rw-r--r--linden/indra/llimage/llimage_vc8.vcproj16
-rw-r--r--linden/indra/llimage/llimageworker.cpp2
6 files changed, 35 insertions, 3 deletions
diff --git a/linden/indra/llimage/files.lst b/linden/indra/llimage/files.lst
index 9e14118..a6ac342 100644
--- a/linden/indra/llimage/files.lst
+++ b/linden/indra/llimage/files.lst
@@ -3,5 +3,7 @@ llimage/llimage.cpp
3llimage/llimagedxt.cpp 3llimage/llimagedxt.cpp
4llimage/llimagej2c.cpp 4llimage/llimagej2c.cpp
5llimage/llimagejpeg.cpp 5llimage/llimagejpeg.cpp
6llimage/llimagepng.cpp
6llimage/llimagetga.cpp 7llimage/llimagetga.cpp
7llimage/llimageworker.cpp 8llimage/llimageworker.cpp
9llimage/llpngwrapper.cpp
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 5175314..b846606 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -1105,7 +1105,8 @@ file_extensions[] =
1105 { "jpg", IMG_CODEC_JPEG }, 1105 { "jpg", IMG_CODEC_JPEG },
1106 { "jpeg", IMG_CODEC_JPEG }, 1106 { "jpeg", IMG_CODEC_JPEG },
1107 { "mip", IMG_CODEC_DXT }, 1107 { "mip", IMG_CODEC_DXT },
1108 { "dxt", IMG_CODEC_DXT } 1108 { "dxt", IMG_CODEC_DXT },
1109 { "png", IMG_CODEC_PNG }
1109}; 1110};
1110#define NUM_FILE_EXTENSIONS sizeof(file_extensions)/sizeof(file_extensions[0]) 1111#define NUM_FILE_EXTENSIONS sizeof(file_extensions)/sizeof(file_extensions[0])
1111 1112
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 489fb27..cd559ec 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -67,7 +67,8 @@ enum
67 IMG_CODEC_TGA = 4, 67 IMG_CODEC_TGA = 4,
68 IMG_CODEC_JPEG = 5, 68 IMG_CODEC_JPEG = 5,
69 IMG_CODEC_DXT = 6, 69 IMG_CODEC_DXT = 6,
70 IMG_CODEC_EOF = 7 70 IMG_CODEC_PNG = 7,
71 IMG_CODEC_EOF = 8
71}; 72};
72 73
73//============================================================================ 74//============================================================================
diff --git a/linden/indra/llimage/llimage.vcproj b/linden/indra/llimage/llimage.vcproj
index 1f8a6ad..984d84e 100644
--- a/linden/indra/llimage/llimage.vcproj
+++ b/linden/indra/llimage/llimage.vcproj
@@ -169,11 +169,17 @@
169 RelativePath=".\llimagejpeg.cpp"> 169 RelativePath=".\llimagejpeg.cpp">
170 </File> 170 </File>
171 <File 171 <File
172 RelativePath=".\llimagepng.cpp">
173 </File>
174 <File
172 RelativePath=".\llimagetga.cpp"> 175 RelativePath=".\llimagetga.cpp">
173 </File> 176 </File>
174 <File 177 <File
175 RelativePath=".\llimageworker.cpp"> 178 RelativePath=".\llimageworker.cpp">
176 </File> 179 </File>
180 <File
181 RelativePath=".\llpngwrapper.cpp">
182 </File>
177 </Filter> 183 </Filter>
178 <Filter 184 <Filter
179 Name="Header Files" 185 Name="Header Files"
@@ -198,11 +204,17 @@
198 RelativePath=".\llimagejpeg.h"> 204 RelativePath=".\llimagejpeg.h">
199 </File> 205 </File>
200 <File 206 <File
207 RelativePath=".\llimagepng.h">
208 </File>
209 <File
201 RelativePath=".\llimagetga.h"> 210 RelativePath=".\llimagetga.h">
202 </File> 211 </File>
203 <File 212 <File
204 RelativePath=".\llimageworker.h"> 213 RelativePath=".\llimageworker.h">
205 </File> 214 </File>
215 <File
216 RelativePath=".\llpngwrapper.h">
217 </File>
206 </Filter> 218 </Filter>
207 <Filter 219 <Filter
208 Name="Resource Files" 220 Name="Resource Files"
diff --git a/linden/indra/llimage/llimage_vc8.vcproj b/linden/indra/llimage/llimage_vc8.vcproj
index 052a28f..dd15d59 100644
--- a/linden/indra/llimage/llimage_vc8.vcproj
+++ b/linden/indra/llimage/llimage_vc8.vcproj
@@ -248,6 +248,10 @@
248 > 248 >
249 </File> 249 </File>
250 <File 250 <File
251 RelativePath=".\llimagepng.cpp"
252 >
253 </File>
254 <File
251 RelativePath=".\llimagetga.cpp" 255 RelativePath=".\llimagetga.cpp"
252 > 256 >
253 </File> 257 </File>
@@ -255,6 +259,10 @@
255 RelativePath=".\llimageworker.cpp" 259 RelativePath=".\llimageworker.cpp"
256 > 260 >
257 </File> 261 </File>
262 <File
263 RelativePath=".\llpngwrapper.cpp"
264 >
265 </File>
258 </Filter> 266 </Filter>
259 <Filter 267 <Filter
260 Name="Header Files" 268 Name="Header Files"
@@ -286,6 +294,10 @@
286 > 294 >
287 </File> 295 </File>
288 <File 296 <File
297 RelativePath=".\llimagepng.h"
298 >
299 </File>
300 <File
289 RelativePath=".\llimagetga.h" 301 RelativePath=".\llimagetga.h"
290 > 302 >
291 </File> 303 </File>
@@ -293,6 +305,10 @@
293 RelativePath=".\llimageworker.h" 305 RelativePath=".\llimageworker.h"
294 > 306 >
295 </File> 307 </File>
308 <File
309 RelativePath=".\llpngwrapper.h"
310 >
311 </File>
296 </Filter> 312 </Filter>
297 <Filter 313 <Filter
298 Name="Resource Files" 314 Name="Resource Files"
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index c59eac2..9affd59 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -1,5 +1,5 @@
1/** 1/**
2 * @file llimage.cpp 2 * @file llimageworker.cpp
3 * @brief Base class for images. 3 * @brief Base class for images.
4 * 4 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 5 * Copyright (c) 2001-2007, Linden Research, Inc.
generated by cgit v1.1 at 2024-11-15 06:45:16 +0000