Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve WebP handling to fix edge cases & Nexus links

Browse Source
This commit is contained in:
trawzified 2023-12-30 11:48:05 +01:00
parent 566b1bd2b5
commit d2158c04d7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Wabbajack.App.Wpf/Util/UIUtils.cs
View File

@ -22,6 +22,8 @@ using Wabbajack.Paths.IO;
using System.Drawing;
using Catel.IO;
using System.Drawing.Imaging;
using System.Linq;
using System.Data;
namespace Wabbajack
{
@ -150,7 +152,20 @@ namespace Wabbajack
if (memStream == null) return default;
try
{
return url.EndsWith("webp", StringComparison.InvariantCultureIgnoreCase) ? BitmapImageFromWebp(memStream.ToArray()) : BitmapImageFromStream(memStream);
// System.Windows.Media.Imaging does not include WebP support by default, it falls back onto Windows Imaging Components (WIC) if it's a format that's not supported.
// Only the latest Windows versions seem to include a new version of WIC that has WebP support, so fallback on libwebp to support all Windows installations
// Also the Nexus image CDN has files ending with PNG/JPEG but they're actually encoded as WebP, so use this method for Nexus aswell
bool isWebp = url.EndsWith("webp", StringComparison.InvariantCultureIgnoreCase) || url.Contains("staticdelivery.nexusmods.com");
try
{
return BitmapImageFromStream(memStream);
}
catch(NotSupportedException)
{
if (isWebp)
return BitmapImageFromWebp(memStream.ToArray());
throw;
}
}
catch (Exception ex)
{