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

Replaces System.Drawing with ImageSharp, and thereby fix TODO.

Browse Source
This commit is contained in:
Bjarke Berg
2021-04-29 20:32:26 +02:00
parent 743f4a6610
commit a854959b85
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Infrastructure/Media/ImageDimensionExtractor.cs
View File

@@ -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;

2
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -45,8 +45,8 @@
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="System.Drawing.Common" Version="5.0.1" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
<PackageReference Include="Examine.Core" Version="2.0.0-alpha.20200128.15" />