fix: return DalamudTextureWrap from LoadImageFromDxgiFormat(), cast e…

…xplicitly
goatcorp · Aug 8, 2023 · ebc4bac · ebc4bac
1 parent 426e7f5
commit ebc4bac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs
@@ -325,7 +325,7 @@ public bool SupportsDxgiFormat(Format dxgiFormat) => this.scene is null
     /// <param name="height">The height in pixels.</param>
     /// <param name="dxgiFormat">Format of the texture.</param>
     /// <returns>A texture, ready to use in ImGui.</returns>
-    public TextureWrap LoadImageFromDxgiFormat(Span<byte> data, int pitch, int width, int height, Format dxgiFormat)
+    public IDalamudTextureWrap LoadImageFromDxgiFormat(Span<byte> data, int pitch, int width, int height, Format dxgiFormat)
     {
         if (this.scene == null)
             throw new InvalidOperationException("Scene isn't ready.");
@@ -360,7 +360,7 @@ public TextureWrap LoadImageFromDxgiFormat(Span<byte> data, int pitch, int width
         }
 
         // no sampler for now because the ImGui implementation we copied doesn't allow for changing it
-        return new D3DTextureWrap(resView, width, height);
+        return new DalamudTextureWrap(new D3DTextureWrap(resView, width, height));
     }
 
 #nullable restore

diff --git a/Dalamud/Interface/Internal/TextureManager.cs b/Dalamud/Interface/Internal/TextureManager.cs
@@ -209,7 +209,7 @@ public TextureManager(Framework framework, DataManager dataManager, InterfaceMan
             throw new InvalidOperationException("Cannot create textures before scene is ready");
 
 #pragma warning disable CS0618
-        return this.dataManager.GetImGuiTexture(file) as IDalamudTextureWrap;
+        return (IDalamudTextureWrap)this.dataManager.GetImGuiTexture(file);
 #pragma warning restore CS0618
     }
 
@@ -332,6 +332,10 @@ internal TextureInfo GetInfo(string path, bool refresh = true, bool rethrow = fa
                 // and we can't do anything about it. Return a dummy texture so that the plugin still
                 // has something to draw.
                 wrap = this.fallbackTextureWrap;
+
+                // Prevent divide-by-zero
+                if (info.Extents == Vector2.Zero)
+                    info.Extents = Vector2.One;
             }
 
             info.Wrap = wrap;