Second Life viewer sources 1.19.1.2

10 files changed, 27 insertions, 22 deletions

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index b9bf26a..15da71a 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -144,7 +144,10 @@ U8* LLImageBase::allocateData(S32 size)
                 mData = new U8[size];
                 if (!mData)
                 {
-                        llerrs << "allocate image data: " << size << llendl;
+                        //llerrs << "allocate image data: " << size << llendl;
+                        llwarns << "allocate image data: " << size << llendl;
+                        size = 0 ;
+                        mWidth = mHeight = 0 ;
                 }
                 mDataSize = size;
         }
@@ -1340,7 +1343,7 @@ S32 LLImageFormatted::calcDiscardLevelBytes(S32 bytes)
 //----------------------------------------------------------------------------
 
 // Subclasses that can handle more than 4 channels should override this function.
-BOOL LLImageFormatted::decode(LLImageRaw* raw_image,F32  decode_time, S32 first_channel, S32 max_channel)
+BOOL LLImageFormatted::decodeChannels(LLImageRaw* raw_image,F32  decode_time, S32 first_channel, S32 max_channel)
 {
         llassert( (first_channel == 0) && (max_channel == 4) );
         return decode( raw_image, decode_time );  // Loads first 4 channels by default.
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index ef736ec..8546303 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -268,11 +268,11 @@ public:
         void appendData(U8 *data, S32 size);
 
         // Loads first 4 channels.
-        virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time=0.0) = 0;  
+        virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time) = 0;  
         // Subclasses that can handle more than 4 channels should override this function.
-        virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time, S32 first_channel, S32 max_channel);
+        virtual BOOL decodeChannels(LLImageRaw* raw_image, F32 decode_time, S32 first_channel, S32 max_channel);
 
-        virtual BOOL encode(const LLImageRaw* raw_image, F32 encode_time=0.0) = 0;
+        virtual BOOL encode(const LLImageRaw* raw_image, F32 encode_time) = 0;
 
         S8 getCodec() const;
         BOOL isDecoding() const { return mDecoding ? TRUE : FALSE; }
diff --git a/linden/indra/llimage/llimagebmp.h b/linden/indra/llimage/llimagebmp.h
index 8c83bc5..2b25c43 100644
--- a/linden/indra/llimage/llimagebmp.h
+++ b/linden/indra/llimage/llimagebmp.h
@@ -45,8 +45,8 @@ public:
         LLImageBMP();
 
         /*virtual*/ BOOL updateData();
-        /*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 time=0.0);
-        /*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);
 
 protected:
         BOOL            decodeColorTable8( U8* dst, U8* src );
diff --git a/linden/indra/llimage/llimagedxt.cpp b/linden/indra/llimage/llimagedxt.cpp
index 722ac9b..d3b8225 100644
--- a/linden/indra/llimage/llimagedxt.cpp
+++ b/linden/indra/llimage/llimagedxt.cpp
@@ -308,7 +308,7 @@ BOOL LLImageDXT::getMipData(LLPointer<LLImageRaw>& raw, S32 discard)
         return TRUE;
 }
 
-BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips)
+BOOL LLImageDXT::encodeDXT(const LLImageRaw* raw_image, F32 time, bool explicit_mips)
 {
         llassert_always(raw_image);
         
@@ -396,7 +396,7 @@ BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mip
 // virtual
 BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time)
 {
-        return encode(raw_image, time, false);
+        return encodeDXT(raw_image, time, false);
 }
 
 // virtual
diff --git a/linden/indra/llimage/llimagedxt.h b/linden/indra/llimage/llimagedxt.h
index c795d4e..f144c21 100644
--- a/linden/indra/llimage/llimagedxt.h
+++ b/linden/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);
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 0011296..9de4d5f 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -250,11 +250,11 @@ BOOL LLImageJ2C::updateData()
 
 BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time)
 {
-        return decode(raw_imagep, decode_time, 0, 4);
+        return decodeChannels(raw_imagep, decode_time, 0, 4);
 }
 
 
-BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count )
+BOOL LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count )
 {
         LLMemType mt1((LLMemType::EMemType)mMemType);
 
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index da844a1..7e02c98 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -46,9 +46,9 @@ public:
 
         // Base class overrides
         /*virtual*/ BOOL updateData();
-        /*virtual*/ BOOL decode(LLImageRaw *raw_imagep, F32 decode_time=0.0);
-        /*virtual*/ BOOL decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count);
-        /*virtual*/ BOOL encode(const LLImageRaw *raw_imagep, F32 encode_time=0.0);
+        /*virtual*/ BOOL decode(LLImageRaw *raw_imagep, F32 decode_time);
+        /*virtual*/ BOOL decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count);
+        /*virtual*/ BOOL encode(const LLImageRaw *raw_imagep, F32 encode_time);
         /*virtual*/ S32 calcHeaderSize();
         /*virtual*/ S32 calcDataSize(S32 discard_level = 0);
         /*virtual*/ S32 calcDiscardLevelBytes(S32 bytes);
diff --git a/linden/indra/llimage/llimagejpeg.h b/linden/indra/llimage/llimagejpeg.h
index b143c47..a890bf4 100644
--- a/linden/indra/llimage/llimagejpeg.h
+++ b/linden/indra/llimage/llimagejpeg.h
@@ -55,8 +55,8 @@ public:
         LLImageJPEG();
 
         /*virtual*/ BOOL updateData();
-        /*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 time=0.0);
-        /*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);
 
         void                    setEncodeQuality( S32 q )       { mEncodeQuality = q; } // on a scale from 1 to 100
         S32                             getEncodeQuality()                      { return mEncodeQuality; }
diff --git a/linden/indra/llimage/llimagepng.h b/linden/indra/llimage/llimagepng.h
index 982454a..7ca59cf 100644
--- a/linden/indra/llimage/llimagepng.h
+++ b/linden/indra/llimage/llimagepng.h
@@ -43,8 +43,8 @@ public:
         LLImagePNG();
 
         BOOL updateData();
-        BOOL decode(LLImageRaw* raw_image, F32 decode_time = 0.0);
-        BOOL encode(const LLImageRaw* raw_image, F32 encode_time = 0.0);
+        BOOL decode(LLImageRaw* raw_image, F32 decode_time);
+        BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
 
 private:
         U8* mTmpWriteBuffer;
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index 2800caf..dc6f2e4 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -115,7 +115,7 @@ bool LLImageWorker::doWork(S32 param)
                 else
                 {
                         // Decode aux channel
-                        decoded = mFormattedImage->decode(mDecodedImage, .1f, param, param); // 1ms
+                        decoded = mFormattedImage->decodeChannels(mDecodedImage, .1f, param, param); // 1ms
                 }
         }
         if (decoded)