From 2dac1b3cf51ba936c271da52ce740a6cd434fb34 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 18 Apr 2017 13:11:44 +1000
Subject: [PATCH] Merge branch 'normalize-stream-seek' of
 https://github.com/JimBobSquarePants/Umbraco-CMS into
 JimBobSquarePants-normalize-stream-seek

# Conflicts:
#	src/Umbraco.Core/Media/ImageHelper.cs
---
 src/Umbraco.Core/IO/PhysicalFileSystem.cs    | 2 +-
 src/Umbraco.Core/Media/ImageHelper.cs        | 4 ++--
 src/Umbraco.Core/Models/ContentExtensions.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 47daff932d..bfa7e4b2d8 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -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);
diff --git a/src/Umbraco.Core/Media/ImageHelper.cs b/src/Umbraco.Core/Media/ImageHelper.cs
index becd8bb5e3..d40a192862 100644
--- a/src/Umbraco.Core/Media/ImageHelper.cs
+++ b/src/Umbraco.Core/Media/ImageHelper.cs
@@ -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);
                         }
diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs
index 9a90e5ac47..7c47c51112 100644
--- a/src/Umbraco.Core/Models/ContentExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -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>();