diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimageworker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp index 9affd59..61b15b2 100644 --- a/linden/indra/llimage/llimageworker.cpp +++ b/linden/indra/llimage/llimageworker.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llimageworker.cpp | 2 | * @file llimageworker.cpp |
3 | * @brief Base class for images. | 3 | * @brief Base class for images. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "linden_common.h" | 32 | #include "linden_common.h" |
@@ -99,10 +102,7 @@ bool LLImageWorker::doWork(S32 param) | |||
99 | } | 102 | } |
100 | else | 103 | else |
101 | { | 104 | { |
102 | S32 nc = param ? 1 : mFormattedImage->getComponents(); | 105 | mDecodedImage = new LLImageRaw(); // allow possibly smaller size set during decoding |
103 | mDecodedImage = new LLImageRaw(mFormattedImage->getWidth(), | ||
104 | mFormattedImage->getHeight(), | ||
105 | nc); | ||
106 | } | 106 | } |
107 | } | 107 | } |
108 | if (!decoded) | 108 | if (!decoded) |