File/image processing: don't read buffer, get byte array

muratcakir · muratcakir · commit a3fa354142b2 · 2020-02-06T04:29:09.000+01:00
diff --git a/src/Libraries/SmartStore.Services/Media/PictureService.cs b/src/Libraries/SmartStore.Services/Media/PictureService.cs
@@ -207,7 +207,7 @@ public virtual byte[] ValidatePicture(byte[] pictureBinary, string mimeType, out
 			using (var result = _imageProcessor.ProcessImage(query))
 			{
 				size = new Size(result.Width, result.Height);
-				var buffer = result.OutputStream.GetBuffer();
+				var buffer = result.OutputStream.ToArray();
 				return buffer;
 			}
 		}
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs
@@ -210,7 +210,7 @@ private void ImageResize(string path, string dest, int maxWidth, int maxHeight,
 
 			using (var result = _imageProcessor.Value.ProcessImage(query))
 			{
-				buffer = result.OutputStream.GetBuffer();
+				buffer = result.OutputStream.ToArray();
 				System.IO.File.WriteAllBytes(dest, buffer);
 			}
 		}
diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs
@@ -351,7 +351,8 @@ private async Task<byte[]> ProcessAndPutToCacheAsync(CachedImageResult cachedIma
 
 				using (var result = _imageProcessor.ProcessImage(processQuery))
 				{
-					var outBuffer = result.OutputStream.GetBuffer();
+					var outBuffer = result.OutputStream.ToArray();
+
 					await _imageCache.PutAsync(cachedImage, outBuffer);
 
 					if (cachedImage.Extension != result.FileExtension)
diff --git a/src/Presentation/SmartStore.Web/Global.asax b/src/Presentation/SmartStore.Web/Global.asax
@@ -1 +1 @@
-﻿<%@ Application Codebehind="Global.asax.cs" Inherits="SmartStore.Web.MvcApplication" Language="C#" %>
+﻿<%@ Application Codebehind="Global.asax.cs" Inherits="SmartStore.Web.MvcApplication" Language="C#" %> 

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public virtual byte[] ValidatePicture(byte[] pictureBinary, string mimeType, out`
`207`	`207`	`using (var result = _imageProcessor.ProcessImage(query))`
`208`	`208`	`{`
`209`	`209`	`size = new Size(result.Width, result.Height);`
`210`		`- var buffer = result.OutputStream.GetBuffer();`
	`210`	`+ var buffer = result.OutputStream.ToArray();`
`211`	`211`	`return buffer;`
`212`	`212`	`}`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ private void ImageResize(string path, string dest, int maxWidth, int maxHeight,`
`210`	`210`
`211`	`211`	`using (var result = _imageProcessor.Value.ProcessImage(query))`
`212`	`212`	`{`
`213`		`- buffer = result.OutputStream.GetBuffer();`
	`213`	`+ buffer = result.OutputStream.ToArray();`
`214`	`214`	`System.IO.File.WriteAllBytes(dest, buffer);`
`215`	`215`	`}`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,8 @@ private async Task<byte[]> ProcessAndPutToCacheAsync(CachedImageResult cachedIma`
`351`	`351`
`352`	`352`	`using (var result = _imageProcessor.ProcessImage(processQuery))`
`353`	`353`	`{`
`354`		`- var outBuffer = result.OutputStream.GetBuffer();`
	`354`	`+ var outBuffer = result.OutputStream.ToArray();`
	`355`	`+`
`355`	`356`	`await _imageCache.PutAsync(cachedImage, outBuffer);`
`356`	`357`
`357`	`358`	`if (cachedImage.Extension != result.FileExtension)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<%@ Application Codebehind="Global.asax.cs" Inherits="SmartStore.Web.MvcApplication" Language="C#" %>`
	`1`	`+<%@ Application Codebehind="Global.asax.cs" Inherits="SmartStore.Web.MvcApplication" Language="C#" %>`