From a854959b853b14a2773e8b18093400876e171a4b Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 29 Apr 2021 20:32:26 +0200 Subject: [PATCH] Replaces System.Drawing with ImageSharp, and thereby fix TODO. --- .../Media/ImageDimensionExtractor.cs | 12 ++++++++---- .../Umbraco.Infrastructure.csproj | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs b/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs index 091d3c395b..f8dc089a0d 100644 --- a/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs +++ b/src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs @@ -1,8 +1,8 @@ using System; -using System.Drawing; using System.IO; +using SixLabors.ImageSharp; +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Media; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Infrastructure.Media { @@ -34,8 +34,12 @@ namespace Umbraco.Cms.Infrastructure.Media // we have no choice but to try to read in via GDI try { - // TODO: We should be using ImageSharp for this - using (var image = Image.FromStream(stream)) + if (stream.CanRead && stream.CanSeek) + { + stream.Seek(0, SeekOrigin.Begin); + } + + using (var image = Image.Load(stream)) { var fileWidth = image.Width; var fileHeight = image.Height; diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 9df72edf84..9dbacfa267 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -45,8 +45,8 @@ + -