diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs index e68a57fe7..3f1a3031c 100644 --- a/src/ImageSharp/Image.FromBytes.cs +++ b/src/ImageSharp/Image.FromBytes.cs @@ -20,126 +20,126 @@ namespace ImageSharp public sealed partial class Image { /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// - /// The stream containing image information. + /// The byte array containing image data. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream) + public static Image Load(byte[] data) { - return Load(stream, null, null); + return Load(data, null, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// - /// The stream containing image information. + /// The byte array containing image data. /// The options for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, IDecoderOptions options) + public static Image Load(byte[] data, IDecoderOptions options) { - return Load(stream, options, null); + return Load(data, options, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// - /// The stream containing image information. + /// The byte array containing image data. /// The config for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, Configuration config) + public static Image Load(byte[] data, Configuration config) { - return Load(stream, null, config); + return Load(data, null, config); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// - /// The stream containing image information. + /// The byte array containing image data. /// The options for the decoder. /// The configuration options. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, IDecoderOptions options, Configuration config) + public static Image Load(byte[] data, IDecoderOptions options, Configuration config) { - using (MemoryStream ms = new MemoryStream(stream)) + using (MemoryStream ms = new MemoryStream(data)) { return Load(ms, options, config); } } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// /// The pixel format. - /// The stream containing image information. + /// The byte array containing image data. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream) + public static Image Load(byte[] data) where TColor : struct, IPixel { - return Load(stream, null, null); + return Load(data, null, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// /// The pixel format. - /// The stream containing image information. + /// The byte array containing image data. /// The options for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, IDecoderOptions options) + public static Image Load(byte[] data, IDecoderOptions options) where TColor : struct, IPixel { - return Load(stream, options, null); + return Load(data, options, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// /// The pixel format. - /// The stream containing image information. + /// The byte array containing image data. /// The config for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, Configuration config) + public static Image Load(byte[] data, Configuration config) where TColor : struct, IPixel { - return Load(stream, null, config); + return Load(data, null, config); } /// - /// Loads the image from the given stream. + /// Loads the image from the given byte array. /// /// The pixel format. - /// The stream containing image information. + /// The byte array containing image data. /// The options for the decoder. /// The configuration options. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(byte[] stream, IDecoderOptions options, Configuration config) + public static Image Load(byte[] data, IDecoderOptions options, Configuration config) where TColor : struct, IPixel { - using (MemoryStream ms = new MemoryStream(stream)) + using (MemoryStream ms = new MemoryStream(data)) { return Load(ms, options, config); } diff --git a/src/ImageSharp/Image.FromFile.cs b/src/ImageSharp/Image.FromFile.cs index b0adb1f96..9b8ba83de 100644 --- a/src/ImageSharp/Image.FromFile.cs +++ b/src/ImageSharp/Image.FromFile.cs @@ -21,124 +21,124 @@ namespace ImageSharp public sealed partial class Image { /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// - /// The stream containing image information. + /// The file path to the image. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream) + public static Image Load(string path) { - return Load(stream, null, null); + return Load(path, null, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// - /// The stream containing image information. + /// The file path to the image. /// The options for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, IDecoderOptions options) + public static Image Load(string path, IDecoderOptions options) { - return Load(stream, options, null); + return Load(path, options, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// - /// The stream containing image information. + /// The file path to the image. /// The config for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, Configuration config) + public static Image Load(string path, Configuration config) { - return Load(stream, null, config); + return Load(path, null, config); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// - /// The stream containing image information. + /// The file path to the image. /// The options for the decoder. /// The configuration options. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, IDecoderOptions options, Configuration config) + public static Image Load(string path, IDecoderOptions options, Configuration config) { - return new Image(Image.Load(stream, options, config)); + return new Image(Load(path, options, config)); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// /// The pixel format. - /// The stream containing image information. + /// The file path to the image. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream) + public static Image Load(string path) where TColor : struct, IPixel { - return Load(stream, null, null); + return Load(path, null, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// /// The pixel format. - /// The stream containing image information. + /// The file path to the image. /// The options for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, IDecoderOptions options) + public static Image Load(string path, IDecoderOptions options) where TColor : struct, IPixel { - return Load(stream, options, null); + return Load(path, options, null); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// /// The pixel format. - /// The stream containing image information. + /// The file path to the image. /// The config for the decoder. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, Configuration config) + public static Image Load(string path, Configuration config) where TColor : struct, IPixel { - return Load(stream, null, config); + return Load(path, null, config); } /// - /// Loads the image from the given stream. + /// Loads the image from the given file. /// /// The pixel format. - /// The stream containing image information. + /// The file path to the image. /// The options for the decoder. /// The configuration options. /// /// Thrown if the stream is not readable nor seekable. /// /// The image - public static Image Load(string stream, IDecoderOptions options, Configuration config) + public static Image Load(string path, IDecoderOptions options, Configuration config) where TColor : struct, IPixel { config = config ?? Configuration.Default; - using (Stream s = config.FileSystem.OpenRead(stream)) + using (Stream s = config.FileSystem.OpenRead(path)) { return Load(s, options, config); }