1berry/FileConverter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tech: Update ffmpeg to v7.1 and ImageMagick to v14.4.

Browse Source
This commit is contained in:
Adrien Allard 2025-02-14 14:47:55 +01:00
parent a435c03a1e
commit b65d507ded
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
View File

@ -175,8 +175,8 @@ namespace FileConverter.ConversionJobs
bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2); bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2);
if (clampSizeToPowerOf2) if (clampSizeToPowerOf2)
{ {
int referenceSize = System.Math.Min(image.Width, image.Height); uint referenceSize = System.Math.Min(image.Width, image.Height);
int size = 2; uint size = 2;
while (size * 2 <= referenceSize) while (size * 2 <= referenceSize)
{ {
size *= 2; size *= 2;
@ -190,11 +190,11 @@ namespace FileConverter.ConversionJobs
if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageMaximumSize)) if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageMaximumSize))
{ {
int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize); uint maximumSize = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
if (maximumSize > 0) if (maximumSize > 0)
{ {
int width = System.Math.Min(image.Width, maximumSize); uint width = System.Math.Min(image.Width, maximumSize);
int height = System.Math.Min(image.Height, maximumSize); uint height = System.Math.Min(image.Height, maximumSize);
Debug.Log($"Clamp size to maximum size of {width}x{width} (from {image.Width}x{image.Height} to {width}x{height})."); Debug.Log($"Clamp size to maximum size of {width}x{width} (from {image.Width}x{image.Height} to {width}x{height}).");
@ -211,7 +211,7 @@ namespace FileConverter.ConversionJobs
break; break;
case OutputType.Jpg: case OutputType.Jpg:
image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality); image.Quality = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageQuality);
break; break;
case OutputType.Pdf: case OutputType.Pdf:
@ -220,7 +220,7 @@ namespace FileConverter.ConversionJobs
break; break;
case OutputType.Webp: case OutputType.Webp:
image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality); image.Quality = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageQuality);
break; break;
default: default:

8
Application/FileConverter/FileConverter.csproj
View File

@ -384,13 +384,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm"> <PackageReference Include="CommunityToolkit.Mvvm">
<Version>8.2.2</Version> <Version>8.4.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Magick.NET-Q16-AnyCPU"> <PackageReference Include="Magick.NET-Q16-AnyCPU">
<Version>13.5.0</Version> <Version>14.4.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection"> <PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>8.0.0</Version> <Version>9.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Office.Interop.Excel"> <PackageReference Include="Microsoft.Office.Interop.Excel">
<Version>15.0.4795.1000</Version> <Version>15.0.4795.1000</Version>
@ -402,7 +402,7 @@
<Version>15.0.4797.1003</Version> <Version>15.0.4797.1003</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf"> <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
<Version>1.1.77</Version> <Version>1.1.135</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Office"> <PackageReference Include="Office">
<Version>12.0.0</Version> <Version>12.0.0</Version>

BIN
Middleware/ffmpeg/ffmpeg.exe
View File

Binary file not shown.

4
README.md
View File

@ -67,10 +67,10 @@ Thanks to all the contributors of File Converter project.
File converter uses the following middlewares: File converter uses the following middlewares:
**ffmpeg** (v6.1.1) as file conversion software. **ffmpeg** (v7.1) as file conversion software.
Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web site link](https://ffmpeg.org) Thanks to ffmpeg devs for this awesome open source file conversion tool. [Web site link](https://ffmpeg.org)
**ImageMagick** (v13.5) as image edition and conversion software. **ImageMagick** (v14.4) as image edition and conversion software.
Thanks to image magick devs for this awesome open source image edition software suite. [Web site link](http://imagemagick.net) Thanks to image magick devs for this awesome open source image edition software suite. [Web site link](http://imagemagick.net)
And thanks to dlemstra for the C# wrapper of this software. [Github link](https://github.com/ImageMagick/ImageMagick) And thanks to dlemstra for the C# wrapper of this software. [Github link](https://github.com/ImageMagick/ImageMagick)