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

Merge branch 'normalize-stream-seek' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-normalize-stream-seek

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Media/ImageHelper.cs
This commit is contained in:
Shannon
2017-04-18 13:11:44 +10:00
parent 68fb951283
commit 2dac1b3cf5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/IO/PhysicalFileSystem.cs
View File

@@ -122,7 +122,7 @@ namespace Umbraco.Core.IO
Directory.CreateDirectory(Path.GetDirectoryName(fullPath)); // ensure it exists
if (stream.CanSeek)
stream.Seek(0, 0);
stream.Seek(0, SeekOrigin.Begin);
using (var destination = (Stream)File.Create(fullPath))
stream.CopyTo(destination);

4
src/Umbraco.Core/Media/ImageHelper.cs
View File

@@ -238,7 +238,7 @@ namespace Umbraco.Core.Media
using (var ms = new MemoryStream())
{
bp.Save(ms, codec, ep);
ms.Seek(0, 0);
ms.Seek(0, SeekOrigin.Begin);
fs.AddFile(predictableThumbnailName, ms);
fs.AddFile(predictableThumbnailNameJpg, ms);
@@ -249,7 +249,7 @@ namespace Umbraco.Core.Media
using (var ms = new MemoryStream())
{
bp.Save(ms, codec, ep);
ms.Seek(0, 0);
ms.Seek(0, SeekOrigin.Begin);
fs.AddFile(newFileName, ms);
}

2
src/Umbraco.Core/Models/ContentExtensions.cs
View File

@@ -545,7 +545,7 @@ namespace Umbraco.Core.Models
if (supportsResizing)
{
//get the original image from the original stream
if (fileStream.CanSeek) fileStream.Seek(0, 0);
if (fileStream.CanSeek) fileStream.Seek(0, SeekOrigin.Begin);
using (var originalImage = Image.FromStream(fileStream))
{
var additionalSizes = new List<int>();