yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V12: Update ImageSharp V3 and Add Legacy V2 Project (#14216)

Browse Source 
* Rename old imagesharp to v2

* Add Ronalds PR as imagesharp

* Ensure that we use V3 by default
This commit is contained in:
Mole
2023-05-09 10:09:54 +02:00
committed by GitHub
parent 7ca6cb97d3
commit 5e9ce916cf
16 changed files with 510 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs
View File

@@ -1,10 +1,7 @@
using System.Globalization;
using System.Numerics;
using Microsoft.Extensions.Logging;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Web;
using SixLabors.ImageSharp.Web.Commands;
using SixLabors.ImageSharp.Web.Processors;
@@ -48,7 +45,8 @@ public class CropWebProcessor : IImageWebProcessor
private static Rectangle? GetCropRectangle(FormattedImage image, CommandCollection commands, CommandParser parser, CultureInfo culture)
{
var coordinates = parser.ParseValue<float[]>(commands.GetValueOrDefault(Coordinates), culture);
if (coordinates.Length != 4 ||
if (coordinates is null ||
coordinates.Length != 4 ||
(coordinates[0] == 0 && coordinates[1] == 0 && coordinates[2] == 0 && coordinates[3] == 0))
{
return null;
@@ -64,7 +62,7 @@ public class CropWebProcessor : IImageWebProcessor
Vector2 xy2 = ExifOrientationUtilities.Transform(new Vector2(right, bottom), Vector2.Zero, Vector2.One, orientation);
// Scale points to a pixel based rectangle
Size size = image.Image.Size();
Size size = image.Image.Size;
return Rectangle.Round(RectangleF.FromLTRB(
MathF.Min(xy1.X, xy2.X) * size.Width,