From 9da4345485c6c2ca63be8fd02498b5e7e7c81612 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Thu, 17 Aug 2017 02:28:43 +0200 Subject: [PATCH] . --- .../ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs | 12 ++++++------ .../ImageComparison/TolerantImageComparer.cs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs index 79dd37893..598834672 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs @@ -40,7 +40,7 @@ namespace ImageSharp.Tests private ITestOutputHelper Output { get; } - private float GetSimilarityPercentage(Image image, TestImageProvider provider) + private float GetDifferenceInPercents(Image image, TestImageProvider provider) where TPixel : struct, IPixel { var reportingComparer = ImageComparer.Tolerant(0, 0); @@ -55,7 +55,7 @@ namespace ImageSharp.Tests return report.TotalNormalizedDifference.Value * 100; } - return 100; + return 0; } [Theory] @@ -68,14 +68,14 @@ namespace ImageSharp.Tests using (Image image = provider.GetImage()) { - double similarity = this.GetSimilarityPercentage(image, provider); - this.Output.WriteLine($"Similarity with ORIGINAL decoder: {similarity:0.0000}%"); + double d = this.GetDifferenceInPercents(image, provider); + this.Output.WriteLine($"Difference using ORIGINAL decoder: {d:0.0000}%"); } using (Image image = provider.GetImage(new PdfJsJpegDecoder())) { - double similarity = this.GetSimilarityPercentage(image, provider); - this.Output.WriteLine($"Similarity with PDFJS decoder: {similarity:0.0000}%"); + double d = this.GetDifferenceInPercents(image, provider); + this.Output.WriteLine($"Difference using PDFJS decoder: {d:0.0000}%"); } } diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs index 23e576180..c4f74e21b 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs @@ -73,13 +73,13 @@ var diff = new PixelDifference(new Point(x, y), aBuffer[x], bBuffer[x]); differences.Add(diff); - float percentageDiff = (float)d / 4.0f / 255.0f; - totalDifference += percentageDiff; + totalDifference += d; } } } float normalizedDifference = totalDifference / ((float)actual.Width * (float)actual.Height); + normalizedDifference /= 4.0f * 255.0f; if (normalizedDifference > this.ImageThreshold) {