From 5ddca73bc31b6a8aab053174d2f2e44d2932f736 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 24 Oct 2016 14:44:18 +1100 Subject: [PATCH] Fix Image.ToString() to reduce debug workload. Former-commit-id: d83a970fe376720fe4dccec41d1c61b485bc5766 Former-commit-id: eac38bb459abfb95817b1bd88519150eff1a21da Former-commit-id: da1bce000ed52f03bbade5542e095bc206f38482 --- src/ImageProcessorCore/Image/Image.cs | 8 +++++++- src/ImageProcessorCore/Image/ImageBase.cs | 6 +++--- src/ImageProcessorCore/Image/ImageFrame.cs | 6 ++++++ .../Formats/GeneralFormatTests.cs | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/ImageProcessorCore/Image/Image.cs b/src/ImageProcessorCore/Image/Image.cs index f1766035f..178cae82a 100644 --- a/src/ImageProcessorCore/Image/Image.cs +++ b/src/ImageProcessorCore/Image/Image.cs @@ -234,12 +234,18 @@ namespace ImageProcessorCore return this; } + /// + public override string ToString() + { + return $"Image: {this.Width}x{this.Height}"; + } + /// /// Returns a Base64 encoded string from the given image. /// /// data:image/gif;base64,R0lGODlhAQABAIABAEdJRgAAACwAAAAAAQABAAACAkQBAA== /// The - public override string ToString() + public string ToBase64String() { using (MemoryStream stream = new MemoryStream()) { diff --git a/src/ImageProcessorCore/Image/ImageBase.cs b/src/ImageProcessorCore/Image/ImageBase.cs index 1eff2741c..e5bfb716d 100644 --- a/src/ImageProcessorCore/Image/ImageBase.cs +++ b/src/ImageProcessorCore/Image/ImageBase.cs @@ -20,9 +20,10 @@ namespace ImageProcessorCore where TColor : IPackedVector where TPacked : struct { + /// - /// The image pixels - /// + /// The image pixels + /// private TColor[] pixelBuffer; /// @@ -83,7 +84,6 @@ namespace ImageProcessorCore public int MaxHeight { get; set; } = int.MaxValue; /// - //public TColor[] Pixels { get; private set; } public TColor[] Pixels => this.pixelBuffer; /// diff --git a/src/ImageProcessorCore/Image/ImageFrame.cs b/src/ImageProcessorCore/Image/ImageFrame.cs index 44d0e07da..6a4ac8ba3 100644 --- a/src/ImageProcessorCore/Image/ImageFrame.cs +++ b/src/ImageProcessorCore/Image/ImageFrame.cs @@ -31,5 +31,11 @@ namespace ImageProcessorCore : base(frame) { } + + /// + public override string ToString() + { + return $"ImageFrame: {this.Width}x{this.Height}"; + } } } diff --git a/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs b/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs index b52abe3fc..5a8f7e370 100644 --- a/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs +++ b/tests/ImageProcessorCore.Tests/Formats/GeneralFormatTests.cs @@ -40,7 +40,7 @@ namespace ImageProcessorCore.Tests Image image = file.CreateImage(); string filename = path + "/" + file.FileNameWithoutExtension + ".txt"; - File.WriteAllText(filename, image.ToString()); + File.WriteAllText(filename, image.ToBase64String()); } }