Skip to content

Commit 2ac2e3c

Browse files
Merge pull request #341 from mdupras/mdupras/web-3.1-fixes
3.1 release compatibility
2 parents 60d19fb + 7c49794 commit 2ac2e3c

10 files changed

+13
-6
lines changed

src/ImageSharp.Web/ExifOrientationUtilities.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Numerics;
55
using System.Runtime.CompilerServices;
66
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
7+
using SixLabors.ImageSharp.Processing;
78

89
namespace SixLabors.ImageSharp.Web;
910

src/ImageSharp.Web/FormattedImage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Six Labors Split License.
33

44
using System.Diagnostics.CodeAnalysis;
5-
using SixLabors.ImageSharp.Advanced;
65
using SixLabors.ImageSharp.Formats;
76
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
7+
using SixLabors.ImageSharp.PixelFormats;
88

99
namespace SixLabors.ImageSharp.Web;
1010

@@ -38,7 +38,7 @@ public FormattedImage(Image image, IImageFormat format)
3838
private FormattedImage(Image image, IImageFormat format, bool keepOpen)
3939
{
4040
this.Image = image;
41-
this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
41+
this.imageFormatsManager = image.Configuration.ImageFormatsManager;
4242
this.format = format;
4343
this.encoder = this.imageFormatsManager.GetEncoder(format);
4444
this.keepOpen = keepOpen;

src/ImageSharp.Web/ImageSharp.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ItemGroup>
4747
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4848
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
49-
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
49+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.0-alpha.0.43" />
5050
</ItemGroup>
5151

5252
<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Extensions.Options;
1010
using Microsoft.IO;
1111
using SixLabors.ImageSharp.Formats;
12+
using SixLabors.ImageSharp.PixelFormats;
1213
using SixLabors.ImageSharp.Web.Caching;
1314
using SixLabors.ImageSharp.Web.Commands;
1415
using SixLabors.ImageSharp.Web.Processors;

src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System.Globalization;
55
using Microsoft.Extensions.Logging;
6+
using SixLabors.ImageSharp.Processing;
67
using SixLabors.ImageSharp.Web.Commands;
78

89
namespace SixLabors.ImageSharp.Web.Processors;

src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System.Globalization;
55
using Microsoft.Extensions.Logging;
6+
using SixLabors.ImageSharp.Processing;
67
using SixLabors.ImageSharp.Web.Commands;
78

89
namespace SixLabors.ImageSharp.Web.Processors;

src/ImageSharp.Web/Processors/QualityWebProcessor.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.Globalization;
55
using Microsoft.Extensions.Logging;
6-
using SixLabors.ImageSharp.Advanced;
76
using SixLabors.ImageSharp.Formats.Jpeg;
87
using SixLabors.ImageSharp.Formats.Webp;
98
using SixLabors.ImageSharp.Web.Commands;
@@ -46,7 +45,7 @@ public FormattedImage Process(
4645
{
4746
JpegEncoder reference =
4847
(JpegEncoder)image.Image
49-
.GetConfiguration()
48+
.Configuration
5049
.ImageFormatsManager
5150
.GetEncoder(image.Format);
5251

@@ -65,7 +64,7 @@ public FormattedImage Process(
6564
{
6665
WebpEncoder reference =
6766
(WebpEncoder)image.Image
68-
.GetConfiguration()
67+
.Configuration
6968
.ImageFormatsManager
7069
.GetEncoder(image.Format);
7170

src/ImageSharp.Web/Processors/ResizeWebProcessor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Numerics;
66
using Microsoft.Extensions.Logging;
77
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
8+
using SixLabors.ImageSharp.Processing;
89
using SixLabors.ImageSharp.Processing.Processors.Transforms;
910
using SixLabors.ImageSharp.Web.Commands;
1011

src/ImageSharp.Web/Resampler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Six Labors Split License.
33

4+
using SixLabors.ImageSharp.Processing;
5+
46
namespace SixLabors.ImageSharp.Web;
57

68
/// <summary>

src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.AspNetCore.Mvc.TagHelpers;
1010
using Microsoft.AspNetCore.Razor.TagHelpers;
1111
using Microsoft.Extensions.Options;
12+
using SixLabors.ImageSharp.Processing;
1213
using SixLabors.ImageSharp.Web.Commands;
1314
using SixLabors.ImageSharp.Web.Middleware;
1415
using SixLabors.ImageSharp.Web.Processors;

0 commit comments

Comments
 (0)