Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 28 insertions, 13 deletions

diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 5175849ad8..0058b91b0f 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -107,6 +107,8 @@ bool LLImageJ2C::updateData()
     bool res = true;
     resetLastError();
 
+    LLImageDataLock lock(this);
+
     // Check to make sure that this instance has been initialized with data
     if (!getData() || (getDataSize() < 16))
     {
@@ -157,22 +159,25 @@ bool LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 fir
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
     LLTimer elapsed;
 
-    bool res = true;
-
     resetLastError();
 
-    // Check to make sure that this instance has been initialized with data
-    if (!getData() || (getDataSize() < 16))
+    bool res;
     {
-        setLastError("LLImageJ2C uninitialized");
-        res = true; // done
-    }
-    else
-    {
-        // Update the raw discard level
-        updateRawDiscardLevel();
+        LLImageDataLock lock(this);
+
         mDecoding = true;
-        res = mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count);
+        // Check to make sure that this instance has been initialized with data
+        if (!getData() || (getDataSize() < 16))
+        {
+            setLastError("LLImageJ2C uninitialized");
+            res = true; // done
+        }
+        else
+        {
+            // Update the raw discard level
+            updateRawDiscardLevel();
+            res = mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count);
+        }
     }
 
     if (res)
@@ -181,12 +186,21 @@ bool LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 fir
         {
             // Failed
             raw_imagep->deleteData();
+            res = false;
         }
         else
         {
             mDecoding = false;
         }
     }
+    else
+    {
+        if (mDecoding)
+        {
+            LL_WARNS() << "decodeImpl failed but mDecoding is true" << LL_ENDL;
+            mDecoding = false;
+        }
+    }
 
     if (!mLastError.empty())
     {
@@ -406,9 +420,10 @@ bool LLImageJ2C::loadAndValidate(const std::string &filename)
 
 bool LLImageJ2C::validate(U8 *data, U32 file_size)
 {
-
     resetLastError();
 
+    LLImageDataLock lock(this);
+
     setData(data, file_size);
 
     bool res = updateData();