Additional debug logging when decoding fails for textures/images

Author: greythane

WhiteCore/Framework/SceneInfo/UuidGatherer.cs

@@ -282,7 +282,9 @@ protected void GetWearableAssetUuids (UUID wearableAssetUuid, IDictionary<UUID,
             if (null != assetBase) {
                 //MainConsole.Instance.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
                 AssetWearable wearableAsset = new AssetBodypart (wearableAssetUuid, assetBase.Data);
-                wearableAsset.Decode ();
+                if (!wearableAsset.Decode ()) {
+                    MainConsole.Instance.DebugFormat("[Wearable]: Unable to decode wearable {0}", wearableAssetUuid.ToString());
+                }
 
                 //MainConsole.Instance.DebugFormat(
                 //    "[Archiver]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);

WhiteCore/Modules/Agent/J2KDecoder/J2KDecoderModule.cs

@@ -138,14 +138,16 @@ public bool Decode (UUID assetID, byte [] j2kData)
 
         public Image DecodeToImage (byte [] j2kData)
         {
-            if (m_useCSJ2K)
-                return J2kImage.FromBytes (j2kData);
+            Image image;
+            if (m_useCSJ2K) {
+                image = J2kImage.FromBytes(j2kData);
+                return image;
+            }
 
             // decode using OpenJpeg
             ManagedImage mimage;
-            Image image;
+
             if (OpenJPEG.DecodeToImage (j2kData, out mimage, out image)) {
-                mimage = null;
                 return image;
             }
 

WhiteCore/Modules/World/WorldMap/MapImageModule.cs

@@ -549,7 +549,10 @@ Mesh GenerateFromPrimSculptData (string primName, PrimitiveBaseShape primShape,
                 try {
                     //idata = m_j2kDecoder.DecodeToImage (primShape.SculptData);
                     ManagedImage mImage;
-                    OpenJPEG.DecodeToImage (primShape.SculptData, out mImage);
+                    if (!OpenJPEG.DecodeToImage(primShape.SculptData, out mImage)) {
+                        MainConsole.Instance.WarnFormat("[Sculpt]: OpenJPEG was not able to decode the scuplt data for {0}. Ignoring.", primName);
+                        return null;
+                    }
 
                     if (mImage == null) {
                         // In some cases it seems that the decode can return a null bitmap without throwing an exception

WhiteCore/Modules/World/WorldMap/TexturedMapTileRenderer.cs

@@ -78,7 +78,9 @@ public UUID AssetID
             asset.Dispose ();
 
             result.AssetData = assetData;
-            result.Decode();
+            if (!result.Decode()) {
+                MainConsole.Instance.ErrorFormat("[MRM] Asset {0} was not able to be decoded", AssetID.ToString());
+            }
             return result;
         }
 

WhiteCore/Modules/World/WorldMap/WarpTileRenderer.cs

@@ -377,8 +377,10 @@ byte [] ConvertTextureData (AssetBase texture, string format)
             try {
                 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
                 image = m_j2kDecoder.DecodeToImage (texture.Data);
-                if (image == null)
-                    return data;
+                if (image == null) {
+                    MainConsole.Instance.DebugFormat("[AssetCAPS]: Unable to decode texture {0}", texture.ID);
+                    return data;
+                }
 
                 // Save to bitmap
                 image = new Bitmap (image);