v0.15.0

saucecontrol · Dec 5, 2024 · 9af284f · 9af284f
1 parent 971cec0
commit 9af284f
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 32 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -27,7 +27,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
+		<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Dist'">

diff --git a/src/MagicScaler/Color/Matrix3x3C.cs b/src/MagicScaler/Color/Matrix3x3C.cs
@@ -79,11 +79,7 @@ public ref readonly Vector3C Row3
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static Matrix3x3C FromRows(in Vector3C r0, in Vector3C r1, in Vector3C r2)
 	{
-#if NET5_0_OR_GREATER
 		Unsafe.SkipInit(out Matrix3x3C r);
-#else
-		var r = default(Matrix3x3C);
-#endif
 
 		ref var rr = ref Unsafe.As<Matrix3x3C, Vector3C>(ref r);
 		Unsafe.Add(ref rr, 0) = r0;

diff --git a/src/MagicScaler/Magic/MagicTransforms.cs b/src/MagicScaler/Magic/MagicTransforms.cs
@@ -423,7 +423,7 @@ public static void AddCropper(PipelineContext ctx)
 
 		// Workaround for WIC JPEG decoder bug https://github.com/saucecontrol/wic-jpeg-bug
 		var src = ctx.Source;
-		if (src is WicFramePixelSource && src.Format == PixelFormat.Cmyk32 && src.Width != crop.Width)
+		if (ctx.ImageFrame is WicPlanarFrame && src.Format == PixelFormat.Cmyk32 && src.Width != crop.Width)
 		{
 			using var buff = BufferPool.RentLocal<byte>(src.Width * src.Format.BytesPerPixel);
 			unsafe

diff --git a/src/MagicScaler/MagicScaler.csproj b/src/MagicScaler/MagicScaler.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>0.15.0</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -14,10 +14,10 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="!$(DefineConstants.Contains('BUILTIN_SPAN'))">
-		<PackageReference Include="System.Buffers" Version="4.5.1" />
-		<PackageReference Include="System.Memory" Version="4.5.5" />
-		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
+		<PackageReference Include="System.Buffers" Version="4.6.0" />
+		<PackageReference Include="System.Memory" Version="4.6.0" />
+		<PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />
+		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
 		<PackageReference Include="IndexRange" Version="1.0.3" />
 	</ItemGroup>
 
@@ -26,7 +26,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(DefineConstants.Contains('BUILTIN_SPAN')) And $(DefineConstants.Contains('NETSTANDARD'))">
-		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(DefineConstants.Contains('NETFRAMEWORK')) And $([MSBuild]::VersionLessThan('$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))', '4.7'))">

diff --git a/src/ManagedCodecs/ImageSharp/ManagedCodecs.ImageSharp.csproj b/src/ManagedCodecs/ImageSharp/ManagedCodecs.ImageSharp.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>0.0.2</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/NativeCodecs/Giflib/NativeCodecs.Giflib.csproj b/src/NativeCodecs/Giflib/NativeCodecs.Giflib.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>5.2.2</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\gif.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\gif.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\gif.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/NativeCodecs/Libheif/NativeCodecs.Libheif.csproj b/src/NativeCodecs/Libheif/NativeCodecs.Libheif.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>1.19.5</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\heif.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\heif.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\heif.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/NativeCodecs/Libjpeg/NativeCodecs.Libjpeg.csproj b/src/NativeCodecs/Libjpeg/NativeCodecs.Libjpeg.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>3.0.4</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\psjpeg.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\psjpeg.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\psjpeg.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/NativeCodecs/Libjxl/NativeCodecs.Libjxl.csproj b/src/NativeCodecs/Libjxl/NativeCodecs.Libjxl.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>0.11.1</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\jxl.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\jxl.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\jxl.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/NativeCodecs/Libpng/NativeCodecs.Libpng.csproj b/src/NativeCodecs/Libpng/NativeCodecs.Libpng.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>1.6.44</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\pspng.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\pspng.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\pspng.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/NativeCodecs/Libwebp/NativeCodecs.Libwebp.csproj b/src/NativeCodecs/Libwebp/NativeCodecs.Libwebp.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>1.4.0</VersionPrefix>
 		<TargetFrameworks>net8.0;net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462;netstandard2.0;netstandard2.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\MagicScaler\MagicScaler.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="Package\build\*" Pack="true" PackagePath="build/net461/;buildTransitive/net461/" />
+		<None Include="Package\build\*" Pack="true" PackagePath="build/net462/;buildTransitive/net462/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x64\bin\webp*.dll" Link="Package\native\win-x64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x64/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-x86\bin\webp*.dll" Link="Package\native\win-x86\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-x86/native/" />
 		<None Include="$(RepositoryRoot)out\vcpkg\install\win-arm64\bin\webp*.dll" Link="Package\native\win-arm64\%(Filename)%(Extension)" Pack="true" PackagePath="runtimes/win-arm64/native/" />

diff --git a/src/WebRSize/WebRSize.csproj b/src/WebRSize/WebRSize.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>0.6.11</VersionPrefix>
 		<TargetFrameworks>net472</TargetFrameworks>
-		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net461</TargetFrameworks>
+		<TargetFrameworks Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">$(TargetFrameworks);net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>