From 12eb5a4a97cbbe30ffd49006610f3040790400ee Mon Sep 17 00:00:00 2001 From: Maxime Dupras Date: Thu, 19 Oct 2023 09:03:56 -0400 Subject: [PATCH 1/4] Added Feedz.io source for alpha builds Updated some using to work with 3.1 releases --- NuGet.Config | 7 +++++++ src/ImageSharp.Web/ExifOrientationUtilities.cs | 1 + src/ImageSharp.Web/FormattedImage.cs | 4 ++-- src/ImageSharp.Web/ImageSharp.Web.csproj | 2 +- src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs | 1 + .../Processors/BackgroundColorWebProcessor.cs | 1 + src/ImageSharp.Web/Processors/QualityWebProcessor.cs | 5 ++--- src/ImageSharp.Web/Processors/ResizeWebProcessor.cs | 1 + src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs | 1 + 9 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 00000000..337b083e --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ImageSharp.Web/ExifOrientationUtilities.cs b/src/ImageSharp.Web/ExifOrientationUtilities.cs index dab77e8c..2995c378 100644 --- a/src/ImageSharp.Web/ExifOrientationUtilities.cs +++ b/src/ImageSharp.Web/ExifOrientationUtilities.cs @@ -4,6 +4,7 @@ using System.Numerics; using System.Runtime.CompilerServices; using SixLabors.ImageSharp.Metadata.Profiles.Exif; +using SixLabors.ImageSharp.Processing; namespace SixLabors.ImageSharp.Web; diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs index 65c82df2..72714d1c 100644 --- a/src/ImageSharp.Web/FormattedImage.cs +++ b/src/ImageSharp.Web/FormattedImage.cs @@ -2,9 +2,9 @@ // Licensed under the Six Labors Split License. using System.Diagnostics.CodeAnalysis; -using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Metadata.Profiles.Exif; +using SixLabors.ImageSharp.PixelFormats; namespace SixLabors.ImageSharp.Web; @@ -38,7 +38,7 @@ public FormattedImage(Image image, IImageFormat format) private FormattedImage(Image image, IImageFormat format, bool keepOpen) { this.Image = image; - this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager; + this.imageFormatsManager = image.Configuration.ImageFormatsManager; this.format = format; this.encoder = this.imageFormatsManager.GetEncoder(format); this.keepOpen = keepOpen; diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj index f6d9b001..1bc756cd 100644 --- a/src/ImageSharp.Web/ImageSharp.Web.csproj +++ b/src/ImageSharp.Web/ImageSharp.Web.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs index fc081169..390557db 100644 --- a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs @@ -3,6 +3,7 @@ using System.Globalization; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Web.Commands; namespace SixLabors.ImageSharp.Web.Processors; diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs index 549fa716..a765806c 100644 --- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs @@ -3,6 +3,7 @@ using System.Globalization; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Web.Commands; namespace SixLabors.ImageSharp.Web.Processors; diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs index 37d8e9da..2400c763 100644 --- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs @@ -3,7 +3,6 @@ using System.Globalization; using Microsoft.Extensions.Logging; -using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Web.Commands; @@ -46,7 +45,7 @@ public FormattedImage Process( { JpegEncoder reference = (JpegEncoder)image.Image - .GetConfiguration() + .Configuration .ImageFormatsManager .GetEncoder(image.Format); @@ -65,7 +64,7 @@ public FormattedImage Process( { WebpEncoder reference = (WebpEncoder)image.Image - .GetConfiguration() + .Configuration .ImageFormatsManager .GetEncoder(image.Format); diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs index 74e504b6..40898561 100644 --- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs @@ -5,6 +5,7 @@ using System.Numerics; using Microsoft.Extensions.Logging; using SixLabors.ImageSharp.Metadata.Profiles.Exif; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Transforms; using SixLabors.ImageSharp.Web.Commands; diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs index 49fe91dd..72b5c2cd 100644 --- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs +++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Processors; From bdc50a5dc235fa9ec7782a6a1cd5f715a5d9d325 Mon Sep 17 00:00:00 2001 From: Maxime Dupras Date: Fri, 27 Oct 2023 13:04:21 -0400 Subject: [PATCH 2/4] Added missing using --- src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs index 08c8df97..a90e9429 100644 --- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs +++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs @@ -9,6 +9,7 @@ using Microsoft.Extensions.Options; using Microsoft.IO; using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Web.Caching; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Processors; From ed3f443009fa07fb994ae35cc75ea1cba68e455e Mon Sep 17 00:00:00 2001 From: Maxime Dupras Date: Fri, 27 Oct 2023 13:07:19 -0400 Subject: [PATCH 3/4] Removed unused NuGet.Config --- NuGet.Config | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 337b083e..00000000 --- a/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From 7c49794d728171b0559743b1b4e5954ac4061bc0 Mon Sep 17 00:00:00 2001 From: Maxime Dupras Date: Fri, 27 Oct 2023 13:12:59 -0400 Subject: [PATCH 4/4] Added missing using for docs --- src/ImageSharp.Web/Resampler.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs index febeecc7..d97143f1 100644 --- a/src/ImageSharp.Web/Resampler.cs +++ b/src/ImageSharp.Web/Resampler.cs @@ -1,6 +1,8 @@ // Copyright (c) Six Labors. // Licensed under the Six Labors Split License. +using SixLabors.ImageSharp.Processing; + namespace SixLabors.ImageSharp.Web; ///