This commit is contained in:
Timothy Baldridge 2021-06-26 06:01:53 -06:00
parent b9a6000a27
commit 10edda9bb5
7 changed files with 20 additions and 11 deletions

View File

@ -1,5 +1,8 @@
### Changelog ### Changelog
#### Version - 2.5.0.3 - 6/26/2021
* HOTFIX: Fix "argument out of range" error when installing modlists
#### Version - 2.5.0.2 - 6/25/2021 #### Version - 2.5.0.2 - 6/25/2021
* HOTFIX: Fix for Nexus files that are downloadable but some API endpoints are unreachable * HOTFIX: Fix for Nexus files that are downloadable but some API endpoints are unreachable

View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.5.0.2</AssemblyVersion> <AssemblyVersion>2.5.0.3</AssemblyVersion>
<FileVersion>2.5.0.1</FileVersion> <FileVersion>2.5.0.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

View File

@ -97,11 +97,17 @@ namespace Wabbajack.ImageHashing
resized = _image.Resize(width, height, TEX_FILTER_FLAGS.DEFAULT); resized = _image.Resize(width, height, TEX_FILTER_FLAGS.DEFAULT);
} }
using var compressed = resized.Compress(newFormat, TEX_COMPRESS_FLAGS.BC7_QUICK, 0.5f);
if (CompressedTypes.Contains(newFormat))
{
var old = resized;
resized = resized.Compress(newFormat, TEX_COMPRESS_FLAGS.BC7_QUICK, 0.5f);
old.Dispose();
}
if (dest.Extension == new Extension(".dds")) if (dest.Extension == new Extension(".dds"))
{ {
compressed.SaveToDDSFile(DDS_FLAGS.NONE, dest.ToString()); resized.SaveToDDSFile(DDS_FLAGS.NONE, dest.ToString());
} }
} }
finally finally

View File

@ -59,7 +59,7 @@ namespace Wabbajack.ImageHashing
} }
catch (Exception ex) catch (Exception ex)
{ {
Utils.Log($"Error getting ImageState: {ex}"); Utils.Log($"Unable to read image state (this is fine)");
return null; return null;
} }
finally finally

View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.5.0.2</AssemblyVersion> <AssemblyVersion>2.5.0.3</AssemblyVersion>
<FileVersion>2.5.0.2</FileVersion> <FileVersion>2.5.0.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.5.0.2</AssemblyVersion> <AssemblyVersion>2.5.0.3</AssemblyVersion>
<FileVersion>2.5.0.2</FileVersion> <FileVersion>2.5.0.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.5.0.2</AssemblyVersion> <AssemblyVersion>2.5.0.3</AssemblyVersion>
<FileVersion>2.5.0.2</FileVersion> <FileVersion>2.5.0.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>