From 731b9ab8e3f72de3959b34a4837bfc11d8e75f76 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Wed, 6 Sep 2017 20:38:30 +0100 Subject: [PATCH] remove IImageFrame interface --- .../{Image => }/ICloningImageProcessor.cs | 0 src/ImageSharp/{Image => }/IImageProcessor.cs | 0 src/ImageSharp/Image/IImageFrame.cs | 32 ------------------- src/ImageSharp/Image/ImageFrame{TPixel}.cs | 10 ++++-- 4 files changed, 7 insertions(+), 35 deletions(-) rename src/ImageSharp/{Image => }/ICloningImageProcessor.cs (100%) rename src/ImageSharp/{Image => }/IImageProcessor.cs (100%) delete mode 100644 src/ImageSharp/Image/IImageFrame.cs diff --git a/src/ImageSharp/Image/ICloningImageProcessor.cs b/src/ImageSharp/ICloningImageProcessor.cs similarity index 100% rename from src/ImageSharp/Image/ICloningImageProcessor.cs rename to src/ImageSharp/ICloningImageProcessor.cs diff --git a/src/ImageSharp/Image/IImageProcessor.cs b/src/ImageSharp/IImageProcessor.cs similarity index 100% rename from src/ImageSharp/Image/IImageProcessor.cs rename to src/ImageSharp/IImageProcessor.cs diff --git a/src/ImageSharp/Image/IImageFrame.cs b/src/ImageSharp/Image/IImageFrame.cs deleted file mode 100644 index a495b5ed8c..0000000000 --- a/src/ImageSharp/Image/IImageFrame.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; -using SixLabors.ImageSharp.MetaData; -using SixLabors.ImageSharp.PixelFormats; - -namespace SixLabors.ImageSharp -{ - /// - /// Encapsulates the basic properties and methods required to manipulate images. - /// - public interface IImageFrame : IDisposable - { - /// - /// Gets the meta data of the image. - /// - ImageFrameMetaData MetaData { get; } - - /// - /// Gets the width. - /// - int Width { get; } - - /// - /// Gets the height. - /// - int Height { get; } - } -} \ No newline at end of file diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs index bb00ebf115..421750d226 100644 --- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs +++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp /// Represents a single frame in a animation. /// /// The pixel format. - public sealed class ImageFrame : IImageFrame, IPixelSource + public sealed class ImageFrame : IPixelSource, IDisposable where TPixel : struct, IPixel { /// @@ -67,10 +67,14 @@ namespace SixLabors.ImageSharp /// Buffer2D IPixelSource.PixelBuffer => this.pixelBuffer; - /// + /// + /// Gets the width. + /// public int Width => this.pixelBuffer.Width; - /// + /// + /// Gets the height. + /// public int Height => this.pixelBuffer.Height; ///