From c5dba754c897bccd1dc7a5c19366ec2a910562b8 Mon Sep 17 00:00:00 2001 From: James South Date: Fri, 20 Jun 2014 20:20:38 +0100 Subject: [PATCH] Fixes issue #56 Former-commit-id: 0c2b86216666e2a6bd11668cb24f228017bfb638 --- src/ImageProcessor/Imaging/Formats/FormatBase.cs | 8 ++++---- src/ImageProcessor/Imaging/Formats/GifFormat.cs | 8 ++++---- .../Imaging/Formats/ISupportedImageFormat.cs | 6 +++--- src/ImageProcessor/Imaging/Formats/JpegFormat.cs | 8 ++++---- src/ImageProcessor/Imaging/Formats/PngFormat.cs | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ImageProcessor/Imaging/Formats/FormatBase.cs b/src/ImageProcessor/Imaging/Formats/FormatBase.cs index a90ee8ce8..6bddd946f 100644 --- a/src/ImageProcessor/Imaging/Formats/FormatBase.cs +++ b/src/ImageProcessor/Imaging/Formats/FormatBase.cs @@ -93,15 +93,15 @@ namespace ImageProcessor.Imaging.Formats /// /// Saves the current image to the specified output stream. /// - /// The to save the image information to. + /// The to save the image information to. /// The to save. /// /// The . /// - public virtual Image Save(MemoryStream memoryStream, Image image) + public virtual Image Save(Stream stream, Image image) { - image.Save(memoryStream, this.ImageFormat); - memoryStream.Position = 0; + image.Save(stream, this.ImageFormat); + stream.Position = 0; return image; } diff --git a/src/ImageProcessor/Imaging/Formats/GifFormat.cs b/src/ImageProcessor/Imaging/Formats/GifFormat.cs index 0ce3f1fef..4a88b6b6f 100644 --- a/src/ImageProcessor/Imaging/Formats/GifFormat.cs +++ b/src/ImageProcessor/Imaging/Formats/GifFormat.cs @@ -104,14 +104,14 @@ namespace ImageProcessor.Imaging.Formats /// /// Saves the current image to the specified output stream. /// - /// - /// The to save the image information to. + /// + /// The to save the image information to. /// /// The to save. /// /// The . /// - public override Image Save(MemoryStream memoryStream, Image image) + public override Image Save(Stream stream, Image image) { // TODO: Move this in here. It doesn't need to be anywhere else. ImageInfo imageInfo = image.GetImageInfo(this.ImageFormat, false); @@ -121,7 +121,7 @@ namespace ImageProcessor.Imaging.Formats image = new OctreeQuantizer(255, 8).Quantize(image); } - return base.Save(memoryStream, image); + return base.Save(stream, image); } /// diff --git a/src/ImageProcessor/Imaging/Formats/ISupportedImageFormat.cs b/src/ImageProcessor/Imaging/Formats/ISupportedImageFormat.cs index 7c3fdcaa4..185cb2e8e 100644 --- a/src/ImageProcessor/Imaging/Formats/ISupportedImageFormat.cs +++ b/src/ImageProcessor/Imaging/Formats/ISupportedImageFormat.cs @@ -86,8 +86,8 @@ namespace ImageProcessor.Imaging.Formats /// /// Saves the current image to the specified output stream. /// - /// - /// The to save the image information to. + /// + /// The to save the image information to. /// /// /// The to save. @@ -95,7 +95,7 @@ namespace ImageProcessor.Imaging.Formats /// /// The . /// - Image Save(MemoryStream memoryStream, Image image); + Image Save(Stream stream, Image image); /// /// Saves the current image to the specified file path. diff --git a/src/ImageProcessor/Imaging/Formats/JpegFormat.cs b/src/ImageProcessor/Imaging/Formats/JpegFormat.cs index dc35db6ed..9447375d9 100644 --- a/src/ImageProcessor/Imaging/Formats/JpegFormat.cs +++ b/src/ImageProcessor/Imaging/Formats/JpegFormat.cs @@ -98,14 +98,14 @@ namespace ImageProcessor.Imaging.Formats /// /// Saves the current image to the specified output stream. /// - /// - /// The to save the image information to. + /// + /// The to save the image information to. /// /// The to save. /// /// The . /// - public override Image Save(MemoryStream memoryStream, Image image) + public override Image Save(Stream stream, Image image) { // Jpegs can be saved with different settings to include a quality setting for the JPEG compression. // This improves output compression and quality. @@ -117,7 +117,7 @@ namespace ImageProcessor.Imaging.Formats if (imageCodecInfo != null) { - image.Save(memoryStream, imageCodecInfo, encoderParameters); + image.Save(stream, imageCodecInfo, encoderParameters); } } diff --git a/src/ImageProcessor/Imaging/Formats/PngFormat.cs b/src/ImageProcessor/Imaging/Formats/PngFormat.cs index 6949b3655..cbfd938dd 100644 --- a/src/ImageProcessor/Imaging/Formats/PngFormat.cs +++ b/src/ImageProcessor/Imaging/Formats/PngFormat.cs @@ -68,19 +68,19 @@ namespace ImageProcessor.Imaging.Formats /// /// Saves the current image to the specified output stream. /// - /// The to save the image information to. + /// The to save the image information to. /// The to save. /// /// The . /// - public override Image Save(MemoryStream memoryStream, Image image) + public override Image Save(Stream stream, Image image) { if (this.IsIndexed) { image = new OctreeQuantizer(255, 8).Quantize(image); } - return base.Save(memoryStream, image); + return base.Save(stream, image); } ///