Added better load error displaying.

"Fixed" bug were images could fail to load when reading tiny mipmaps, in that I now completely ignore them.
KFreon · Feb 2, 2017 · 3405b4b · 3405b4b
1 parent f72461b
commit 3405b4b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/CSharpImageLibrary/DDS/DDSGeneral.cs b/CSharpImageLibrary/DDS/DDSGeneral.cs
@@ -30,7 +30,10 @@ private static MipMap ReadUncompressedMipMap(MemoryStream stream, int mipOffset,
         {
             byte[] data = stream.GetBuffer();
             byte[] mipmap = new byte[mipHeight * mipWidth * 4 * formatDetails.ComponentSize];
-            DDS_Decoders.ReadUncompressed(data, mipOffset, mipmap, mipWidth * mipHeight, ddspf, formatDetails);
+
+            // Smaller sizes breaks things, so just exclude them
+            if (mipHeight >= 4 && mipWidth >= 4)
+                DDS_Decoders.ReadUncompressed(data, mipOffset, mipmap, mipWidth * mipHeight, ddspf, formatDetails);
 
             return new MipMap(mipmap, mipWidth, mipHeight, formatDetails);
         }

diff --git a/UI_Project/NewMainWindow.xaml b/UI_Project/NewMainWindow.xaml
@@ -1063,7 +1063,7 @@
 
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding LoadFailed}" Value="True">
-                            <Setter Property="Content" Value="Load failed!"/>
+                            <Setter Property="Content" Value="{Binding LoadFailError}"/>
                             <Setter Property="FontSize" Value="10"/>
                             <Setter Property="BorderBrush" Value="Red"/>
                         </DataTrigger>

diff --git a/UI_Project/NewViewModel.cs b/UI_Project/NewViewModel.cs
@@ -667,6 +667,19 @@ public bool LoadFailed
             }
         }
 
+        string loadFailError = null;
+        public string LoadFailError
+        {
+            get
+            {
+                return loadFailError;
+            }
+            set
+            {
+                SetProperty(ref loadFailError, value);
+            }
+        }
+
 
         bool isImageLoaded = false;
         public bool IsImageLoaded
@@ -1162,7 +1175,8 @@ internal async Task LoadImage(string path)
             }
             catch (Exception e)
             {
-                Trace.WriteLine($"Failed to read image from disk: {e.Message}");
+                Trace.WriteLine($"IO failure when reading image from disk: {e.Message}");
+                LoadFailError = $"IO failure.{Environment.NewLine} {e.Message}";
                 LoadFailed = true;
                 return;
             }
@@ -1195,6 +1209,7 @@ internal async Task<bool> LoadImage(byte[] data)
             }
             catch(Exception e)
             {
+                LoadFailError = e.Message;
                 LoadFailed = true;
                 return false;
             }
@@ -1262,6 +1277,7 @@ void CloseImage(bool updateUI)
             BulkConvertFailed.Clear();
             MergeChannelsImages.Clear();
             LoadFailed = false;
+            LoadFailError = null;
             previousAlphaSetting = AlphaDisplaySettings.PremultiplyAlpha;
             SavePanelOpen = false;