19 files changed, 143 insertions, 31 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index fccd7b3..db19bd6 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -2,6 +2,8 @@
 * @file llimage.cpp
 * @brief Base class for images.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,22 +26,17 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
-#include <stdlib.h>
+#include "llimage.h"
-#include <string.h>
-#include <stdio.h>
-#include <algorithm>
-#include <iostream>
 #include "llmath.h"
-#include "stdtypes.h"
 #include "v4coloru.h"
 #include "llmemtype.h"
-#include "llimage.h"
 #include "llimagebmp.h"
 #include "llimagetga.h"
 #include "llimagej2c.h"
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index e706c0a..65a7c54 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -2,6 +2,8 @@
 * @file llimage.h
 * @brief Object for managing images and their textures.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,12 +26,12 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGE_H
 #define LL_LLIMAGE_H
-#include "stdtypes.h"
 #include "lluuid.h"
 #include "llstring.h"
 #include "llmemory.h"
@@ -112,7 +114,7 @@ protected:
 public:
        static const LLString& getLastError() {return sLastErrorMessage;};
        static void resetLastError() {sLastErrorMessage = LLString("No Error"); };
-        static BOOL setLastError(const LLString& message, const LLString& filename = ""); // returns FALSE
+        static BOOL setLastError(const LLString& message, const LLString& filename = LLString()); // returns FALSE
        static void generateMip(const U8 *indata, U8* mipdata, int width, int height, S32 nchannels);
        
diff --git a/linden/indra/llimage/llimagebmp.cpp b/linden/indra/llimage/llimagebmp.cpp
index eaed63d..f842300 100644
--- a/linden/indra/llimage/llimagebmp.cpp
+++ b/linden/indra/llimage/llimagebmp.cpp
@@ -1,6 +1,8 @@
 /** 
 * @file llimagebmp.cpp
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llimage/llimagebmp.h b/linden/indra/llimage/llimagebmp.h
index 556b4a2..2924ff4 100644
--- a/linden/indra/llimage/llimagebmp.h
+++ b/linden/indra/llimage/llimagebmp.h
@@ -2,6 +2,8 @@
 * @file llimagebmp.h
 * @brief Image implementation for BMP.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEBMP_H
diff --git a/linden/indra/llimage/llimagedxt.cpp b/linden/indra/llimage/llimagedxt.cpp
index 22d7557..6feece4 100644
--- a/linden/indra/llimage/llimagedxt.cpp
+++ b/linden/indra/llimage/llimagedxt.cpp
@@ -1,6 +1,8 @@
 /** 
 * @file llimagedxt.cpp
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llimage/llimagedxt.h b/linden/indra/llimage/llimagedxt.h
index c52c866..23a5047 100644
--- a/linden/indra/llimage/llimagedxt.h
+++ b/linden/indra/llimage/llimagedxt.h
@@ -1,6 +1,8 @@
 /** 
 * @file llimagedxt.h
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEDXT_H
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 305b11d..0911c43 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -1,6 +1,8 @@
 /** 
 * @file llimagej2c.cpp
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
@@ -35,11 +38,13 @@
 typedef LLImageJ2CImpl* (*CreateLLImageJ2CFunction)();
 typedef void (*DestroyLLImageJ2CFunction)(LLImageJ2CImpl*);
+typedef const char* (*EngineInfoLLImageJ2CFunction)();
 //some "private static" variables so we only attempt to load
 //dynamic libaries once
 CreateLLImageJ2CFunction j2cimpl_create_func;
 DestroyLLImageJ2CFunction j2cimpl_destroy_func;
+EngineInfoLLImageJ2CFunction j2cimpl_engineinfo_func;
 apr_pool_t *j2cimpl_dso_memory_pool;
 apr_dso_handle_t *j2cimpl_dso_handle;
@@ -49,9 +54,10 @@ apr_dso_handle_t *j2cimpl_dso_handle;
 //function should ever be included
 LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl();
 void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl);
+const char* fallbackEngineInfoLLImageJ2CImpl();
 //static
-//Loads the required "create" and "destroy" functions needed
+//Loads the required "create", "destroy" and "engineinfo" functions needed
 void LLImageJ2C::openDSO()
 {
        //attempt to load a DSO and get some functions from it
@@ -70,8 +76,8 @@ void LLImageJ2C::openDSO()
 #endif
        dso_path = gDirUtilp->findFile(dso_name,
-                                                                   gDirUtilp->getAppRODataDir(),
+                                       gDirUtilp->getAppRODataDir(),
-                                                                   gDirUtilp->getExecutableDir());
+                                       gDirUtilp->getExecutableDir());
        j2cimpl_dso_handle      = NULL;
        j2cimpl_dso_memory_pool = NULL;
@@ -89,6 +95,7 @@ void LLImageJ2C::openDSO()
                //now we want to load the functions we're interested in
                CreateLLImageJ2CFunction  create_func = NULL;
                DestroyLLImageJ2CFunction dest_func = NULL;
+                EngineInfoLLImageJ2CFunction engineinfo_func = NULL;
                rv = apr_dso_sym((apr_dso_handle_sym_t*)&create_func,
                                                 j2cimpl_dso_handle,
@@ -100,13 +107,21 @@ void LLImageJ2C::openDSO()
                        //so lets check for a destruction function
                        rv = apr_dso_sym((apr_dso_handle_sym_t*)&dest_func,
                                                         j2cimpl_dso_handle,
-                                                         "destroyLLImageJ2CKDU");
+                                                       "destroyLLImageJ2CKDU");
                        if ( rv == APR_SUCCESS )
                        {
-                                //k, everything is loaded alright
+                                //we've loaded the destroy function ok
-                                j2cimpl_create_func  = create_func;
+                                rv = apr_dso_sym((apr_dso_handle_sym_t*)&engineinfo_func,
-                                j2cimpl_destroy_func = dest_func;
+                                                 j2cimpl_dso_handle,
-                                all_functions_loaded = true;
+                                                 "engineInfoLLImageJ2CKDU");
+                                if ( rv == APR_SUCCESS )
+                                {
+                                        //ok, everything is loaded alright
+                                        j2cimpl_create_func  = create_func;
+                                        j2cimpl_destroy_func = dest_func;
+                                        j2cimpl_engineinfo_func = engineinfo_func;
+                                        all_functions_loaded = true;
+                                }
                        }
                }
        }
@@ -149,6 +164,15 @@ void LLImageJ2C::closeDSO()
        if (j2cimpl_dso_memory_pool) apr_pool_destroy(j2cimpl_dso_memory_pool);
 }
+//static
+std::string LLImageJ2C::getEngineInfo()
+{
+        if (!j2cimpl_engineinfo_func)
+                j2cimpl_engineinfo_func = fallbackEngineInfoLLImageJ2CImpl;
+        return j2cimpl_engineinfo_func();
+}
 LLImageJ2C::LLImageJ2C() :      LLImageFormatted(IMG_CODEC_J2C),
                                                        mMaxBytes(0),
                                                        mRawDiscardLevel(-1),
@@ -156,7 +180,7 @@ LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),
                                                        mReversible(FALSE)
        
 {
-        //We assume here that if we wanted to destory via
+        //We assume here that if we wanted to create via
        //a dynamic library that the approriate open calls were made
        //before any calls to this constructor.
@@ -175,7 +199,7 @@ LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),
 // virtual
 LLImageJ2C::~LLImageJ2C()
 {
-        //We assume here that if we wanted to destory via
+        //We assume here that if we wanted to destroy via
        //a dynamic library that the approriate open calls were made
        //before any calls to this destructor.
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index 00cb919..35b4d6b 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -2,6 +2,8 @@
 * @file llimagej2c.h
 * @brief Image implmenation for jpeg2000.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEJ2C_H
@@ -68,6 +71,7 @@ public:
        static void openDSO();
        static void closeDSO();
+        static std::string getEngineInfo();
        
 protected:
        friend class LLImageJ2CImpl;
diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp
index 4ceecdf..f9b36bd 100644
--- a/linden/indra/llimage/llimagejpeg.cpp
+++ b/linden/indra/llimage/llimagejpeg.cpp
@@ -1,6 +1,8 @@
 /** 
 * @file llimagejpeg.cpp
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llimage/llimagejpeg.h b/linden/indra/llimage/llimagejpeg.h
index 34b3f76..0be4002 100644
--- a/linden/indra/llimage/llimagejpeg.h
+++ b/linden/indra/llimage/llimagejpeg.h
@@ -2,6 +2,8 @@
 * @file llimagejpeg.h
 * @brief This class compresses and decompresses JPEG files
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEJPEG_H
diff --git a/linden/indra/llimage/llimagepng.cpp b/linden/indra/llimage/llimagepng.cpp
index d6b62a8..3e0414f 100644
--- a/linden/indra/llimage/llimagepng.cpp
+++ b/linden/indra/llimage/llimagepng.cpp
@@ -2,8 +2,9 @@
 * @file llimagepng.cpp
 * @brief LLImageFormatted glue to encode / decode PNG files.
 *
- * Copyright (c) 2007 Peekay Semyorka.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llimage/llimagepng.h b/linden/indra/llimage/llimagepng.h
index abdff7c..7a8e1f9 100644
--- a/linden/indra/llimage/llimagepng.h
+++ b/linden/indra/llimage/llimagepng.h
@@ -1,8 +1,9 @@
 /* 
 * @file llimagepng.h
 *
- * Copyright (c) 2007 Peekay Semyorka.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEPNG_H
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 39da50a..805297f 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -1,6 +1,8 @@
 /** 
 * @file llimagetga.cpp
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
@@ -747,6 +750,7 @@ BOOL LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, BOOL &alpha_opaque
        U32* dst_pixels = (U32*) dst;
        U8* src = getData() + mDataOffset;
+        U8* last_src = src + getDataSize();
        U32 rgba;
        U8* rgba_byte_p = (U8*) &rgba;
@@ -755,6 +759,10 @@ BOOL LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, BOOL &alpha_opaque
        while( dst_pixels <= last_dst_pixel )
        {
                // Read RLE block header
+                
+                if (src >= last_src)
+                        return FALSE;
                U8 block_header_byte = *src;
                src++;
@@ -762,6 +770,10 @@ BOOL LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, BOOL &alpha_opaque
                if( block_header_byte & 0x80 )
                {
                        // Encoded (duplicate-pixel) block
+                        if (src + 3 >= last_src)
+                                return FALSE;
+                        
                        rgba_byte_p[0] = src[2];
                        rgba_byte_p[1] = src[1];
                        rgba_byte_p[2] = src[0];
@@ -786,6 +798,9 @@ BOOL LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, BOOL &alpha_opaque
                        // Unencoded block
                        do
                        {
+                                if (src + 3 >= last_src)
+                                        return FALSE;
+                                
                                ((U8*)dst_pixels)[0] = src[2];
                                ((U8*)dst_pixels)[1] = src[1];
                                ((U8*)dst_pixels)[2] = src[0];
@@ -813,10 +828,16 @@ BOOL LLImageTGA::decodeTruecolorRle15( LLImageRaw* raw_image )
        U8* dst = raw_image->getData();
        U8* src = getData() + mDataOffset;
+        U8* last_src = src + getDataSize();
        U8* last_dst = dst + getComponents() * (getHeight() * getWidth() - 1);
        while( dst <= last_dst )
        {
                // Read RLE block header
+                if (src >= last_src)
+                        return FALSE;
                U8 block_header_byte = *src;
                src++;
@@ -826,6 +847,9 @@ BOOL LLImageTGA::decodeTruecolorRle15( LLImageRaw* raw_image )
                        // Encoded (duplicate-pixel) block
                        do
                        {
+                                if (src + 2 >= last_src)
+                                        return FALSE;
+                                
                                decodeTruecolorPixel15( dst, src );   // slow
                                dst += 3;
                                block_pixel_count--;
@@ -838,6 +862,9 @@ BOOL LLImageTGA::decodeTruecolorRle15( LLImageRaw* raw_image )
                        // Unencoded block
                        do
                        {
+                                if (src + 2 >= last_src)
+                                        return FALSE;
                                decodeTruecolorPixel15( dst, src );
                                dst += 3;
                                src += 2;
@@ -859,10 +886,16 @@ BOOL LLImageTGA::decodeTruecolorRle24( LLImageRaw* raw_image )
        U8* dst = raw_image->getData();
        U8* src = getData() + mDataOffset;
+        U8* last_src = src + getDataSize();
        U8* last_dst = dst + getComponents() * (getHeight() * getWidth() - 1);
        while( dst <= last_dst )
        {
                // Read RLE block header
+                if (src >= last_src)
+                        return FALSE;
+        
                U8 block_header_byte = *src;
                src++;
@@ -872,6 +905,8 @@ BOOL LLImageTGA::decodeTruecolorRle24( LLImageRaw* raw_image )
                        // Encoded (duplicate-pixel) block
                        do
                        {
+                                if (src + 2 >= last_src)
+                                        return FALSE;
                                dst[0] = src[2];
                                dst[1] = src[1];
                                dst[2] = src[0];
@@ -886,6 +921,9 @@ BOOL LLImageTGA::decodeTruecolorRle24( LLImageRaw* raw_image )
                        // Unencoded block
                        do
                        {
+                                if (src + 2 >= last_src)
+                                        return FALSE;
+                                
                                dst[0] = src[2];
                                dst[1] = src[1];
                                dst[2] = src[0];
@@ -908,16 +946,25 @@ BOOL LLImageTGA::decodeTruecolorRle8( LLImageRaw* raw_image )
        U8* dst = raw_image->getData();
        U8* src = getData() + mDataOffset;
+        U8* last_src = src + getDataSize();
        U8* last_dst = dst + getHeight() * getWidth() - 1;
+        
        while( dst <= last_dst )
        {
                // Read RLE block header
+                if (src >= last_src)
+                        return FALSE;
                U8 block_header_byte = *src;
                src++;
                U8 block_pixel_count = (block_header_byte & 0x7F) + 1;
                if( block_header_byte & 0x80 )
                {
+                        if (src >= last_src)
+                                return FALSE;
+                        
                        // Encoded (duplicate-pixel) block
                        memset( dst, *src, block_pixel_count );
                        dst += block_pixel_count;
@@ -928,6 +975,9 @@ BOOL LLImageTGA::decodeTruecolorRle8( LLImageRaw* raw_image )
                        // Unencoded block
                        do
                        {
+                                if (src >= last_src)
+                                        return FALSE;
+                                
                                *dst = *src;
                                dst++;
                                src++;
diff --git a/linden/indra/llimage/llimagetga.h b/linden/indra/llimage/llimagetga.h
index d4d56d0..3bfe4e6 100644
--- a/linden/indra/llimage/llimagetga.h
+++ b/linden/indra/llimage/llimagetga.h
@@ -2,6 +2,8 @@
 * @file llimagetga.h
 * @brief Image implementation to compresses and decompressed TGA files.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGETGA_H
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 @@
 * @file llimageworker.cpp
 * @brief Base class for images.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
@@ -99,10 +102,7 @@ bool LLImageWorker::doWork(S32 param)
                }
                else
                {
-                        S32 nc = param ? 1 : mFormattedImage->getComponents();
+                        mDecodedImage = new LLImageRaw(); // allow possibly smaller size set during decoding
-                        mDecodedImage = new LLImageRaw(mFormattedImage->getWidth(),
-                                                                                   mFormattedImage->getHeight(),
-                                                                                   nc);
                }
        }
        if (!decoded)
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h
index a84918d..f9c592f 100644
--- a/linden/indra/llimage/llimageworker.h
+++ b/linden/indra/llimage/llimageworker.h
@@ -2,6 +2,8 @@
 * @file llimageworker.h
 * @brief Object for managing images and their textures.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLIMAGEWORKER_H
diff --git a/linden/indra/llimage/llmapimagetype.h b/linden/indra/llimage/llmapimagetype.h
index 690d3ec..b9d20d1 100644
--- a/linden/indra/llimage/llmapimagetype.h
+++ b/linden/indra/llimage/llmapimagetype.h
@@ -1,6 +1,8 @@
 /** 
 * @file llmapimagetype.h
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLMAPIMAGETYPE_H
diff --git a/linden/indra/llimage/llpngwrapper.cpp b/linden/indra/llimage/llpngwrapper.cpp
index 52616d1..74a09b2 100644
--- a/linden/indra/llimage/llpngwrapper.cpp
+++ b/linden/indra/llimage/llpngwrapper.cpp
@@ -2,8 +2,9 @@
 * @file llpngwrapper.cpp
 * @brief Encapsulates libpng read/write functionality.
 *
- * Copyright (c) 2007 Peekay Semyorka.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llimage/llpngwrapper.h b/linden/indra/llimage/llpngwrapper.h
index 1b5b97f..1c66b8a 100644
--- a/linden/indra/llimage/llpngwrapper.h
+++ b/linden/indra/llimage/llpngwrapper.h
@@ -1,8 +1,9 @@
 /*
 * @file llpngwrapper.h
 *
- * Copyright (c) 2007 Peekay Semyorka.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +25,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLPNGWRAPPER_H