diff options
| author | Mary <mary@mary.zone> | 2022-12-01 23:06:55 +0100 |
|---|---|---|
| committer | Mary <mary@mary.zone> | 2022-12-01 23:06:55 +0100 |
| commit | d692a9b83ebb1c0303f91adaa22cd67852f2386f (patch) | |
| tree | 0c2a8c829f199526eb6c55e4c8af2b6c23d29d0b | |
| parent | 9677ddaa5d8424604bdbf17496f8a878855a118d (diff) | |
Revert "nuget: bump SixLabors.ImageSharp from 1.0.4 to 2.1.3 (#3976)"1.1.409
This reverts commit 9677ddaa5d8424604bdbf17496f8a878855a118d.
SixLabors.ImageShar switched to a shady and vague license starting with 2.x
without mentioning it on their changelog.
As a result we are staying on 1.x (licensed under Apache-2) and will
seak an alternative package.
| -rw-r--r-- | Ryujinx.Ava/Ryujinx.Ava.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.Ava/Ui/Windows/IconColorPicker.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.HLE/Ryujinx.HLE.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx/Ryujinx.csproj | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index 46b24dbd..c7b0eadc 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -38,7 +38,7 @@ <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" /> <PackageReference Include="SPB" Version="0.0.4-build28" /> <PackageReference Include="SharpZipLib" Version="1.4.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" /> + <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Ava/Ui/Windows/IconColorPicker.cs b/Ryujinx.Ava/Ui/Windows/IconColorPicker.cs index 14cd6831..7cf4c2ed 100644 --- a/Ryujinx.Ava/Ui/Windows/IconColorPicker.cs +++ b/Ryujinx.Ava/Ui/Windows/IconColorPicker.cs @@ -125,7 +125,7 @@ namespace Ryujinx.Ava.Ui.Windows public static Bgra32[] GetBuffer(Image<Bgra32> image) { - return image.DangerousTryGetSinglePixelMemory(out var data) ? data.ToArray() : new Bgra32[0]; + return image.TryGetSinglePixelSpan(out var data) ? data.ToArray() : new Bgra32[0]; } private static int GetColorScore(Dictionary<int, int> dominantColorBin, int maxHitCount, PaletteColor color) diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs index 09f81f0f..6c0955ec 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs @@ -549,12 +549,12 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard // Convert the pixel format used in the image to the one used in the Switch surface. - if (!_surface.DangerousTryGetSinglePixelMemory(out Memory<Argb32> pixels)) + if (!_surface.TryGetSinglePixelSpan(out Span<Argb32> pixels)) { return; } - _bufferData = MemoryMarshal.AsBytes(pixels.Span).ToArray(); + _bufferData = MemoryMarshal.AsBytes(pixels).ToArray(); Span<uint> dataConvert = MemoryMarshal.Cast<byte, uint>(_bufferData); Debug.Assert(_bufferData.Length == _surfaceInfo.Size); diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index f5d5042f..1ec92a44 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -24,7 +24,7 @@ <PackageReference Include="Concentus" Version="1.1.7" /> <PackageReference Include="LibHac" Version="0.17.0" /> <PackageReference Include="MsgPack.Cli" Version="1.0.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" /> + <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" /> </ItemGroup> diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index 0fbd7e3a..31f130c4 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -27,7 +27,7 @@ <PackageReference Include="OpenTK.Graphics" Version="4.7.5" /> <PackageReference Include="SPB" Version="0.0.4-build28" /> <PackageReference Include="SharpZipLib" Version="1.4.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" /> + <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> </ItemGroup> <ItemGroup> |