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

Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5

Browse Source 
Conflicts:
	src/Umbraco.Core/IO/FileSystemExtensions.cs
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
This commit is contained in:
Shannon
2014-07-10 11:53:45 +10:00
parent 93151a43ac 874f464a2b
commit 17b0547cfc
6 changed files with 85 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Core/IO/UmbracoMediaFile.cs
View File

@@ -153,13 +153,14 @@ namespace Umbraco.Core.IO
{
EnsureFileSupportsResizing();
using (var fs = _fs.OpenFile(Path))
{
using (var image = Image.FromStream(fs))
using (var fs = _fs.OpenFile(Path))
using (var image = Image.FromStream(fs))
{
{
var fileWidth = image.Width;
var fileHeight = image.Height;
_size = new Size(fileWidth, fileHeight);
var fileWidth = image.Width;
var fileHeight = image.Height;
_size = new Size(fileWidth, fileHeight);
}
}
}
}