tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use the same tolerance values for both decoder's tests

af/merge-core
Anton Firszov 8 years ago
parent
7d049513f5
commit
97b9e2f5d6
1 changed files with 11 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

23
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
View File

@ -79,19 +79,18 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.RgbaVector; public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.RgbaVector;
private const float BaselineTolerance_Orig = 0.001F / 100; private const float BaselineTolerance = 0.001F / 100;
private const float BaselineTolerance_PdfJs = 0.005F; private const float ProgressiveTolerance = 0.2F / 100;
private const float ProgressiveTolerance_Orig = 0.2F / 100;
private const float ProgressiveTolerance_PdfJs = 0.33F / 100;
private ImageComparer GetImageComparerForOrigDecoder<TPixel>(TestImageProvider<TPixel> provider) private ImageComparer GetImageComparer<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
string file = provider.SourceFileOrDescription; string file = provider.SourceFileOrDescription;
if (!CustomToleranceValues.TryGetValue(file, out float tolerance)) if (!CustomToleranceValues.TryGetValue(file, out float tolerance))
{ {
tolerance = file.ToLower().Contains("baseline") ? BaselineTolerance_Orig : ProgressiveTolerance_Orig; bool baseline = file.ToLower().Contains("baseline");
tolerance = baseline ? BaselineTolerance : ProgressiveTolerance;
} }
return ImageComparer.Tolerant(tolerance); return ImageComparer.Tolerant(tolerance);
@ -158,7 +157,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
image.DebugSave(provider); image.DebugSave(provider);
provider.Utility.TestName = DecodeBaselineJpegOutputName; provider.Utility.TestName = DecodeBaselineJpegOutputName;
image.CompareToReferenceOutput(ImageComparer.Tolerant(BaselineTolerance_Orig), provider, appendPixelTypeToFileName: false); image.CompareToReferenceOutput(ImageComparer.Tolerant(BaselineTolerance), provider, appendPixelTypeToFileName: false);
} }
provider.Configuration.MemoryManager.ReleaseRetainedResources(); provider.Configuration.MemoryManager.ReleaseRetainedResources();
@ -182,7 +181,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
image.DebugSave(provider); image.DebugSave(provider);
provider.Utility.TestName = DecodeBaselineJpegOutputName; provider.Utility.TestName = DecodeBaselineJpegOutputName;
image.CompareToReferenceOutput( image.CompareToReferenceOutput(
this.GetImageComparerForOrigDecoder(provider), this.GetImageComparer(provider),
provider, provider,
appendPixelTypeToFileName: false); appendPixelTypeToFileName: false);
} }
@ -207,7 +206,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
provider.Utility.TestName = DecodeBaselineJpegOutputName; provider.Utility.TestName = DecodeBaselineJpegOutputName;
image.CompareToReferenceOutput( image.CompareToReferenceOutput(
ImageComparer.Tolerant(BaselineTolerance_PdfJs), this.GetImageComparer(provider),
provider, provider,
appendPixelTypeToFileName: false); appendPixelTypeToFileName: false);
} }
@ -233,7 +232,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
{ {
image.DebugSave(provider); image.DebugSave(provider);
image.CompareToReferenceOutput( image.CompareToReferenceOutput(
ImageComparer.Tolerant(BaselineTolerance_Orig), ImageComparer.Tolerant(BaselineTolerance),
provider, provider,
appendPixelTypeToFileName: true); appendPixelTypeToFileName: true);
} }
@ -269,7 +268,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
provider.Utility.TestName = DecodeProgressiveJpegOutputName; provider.Utility.TestName = DecodeProgressiveJpegOutputName;
image.CompareToReferenceOutput( image.CompareToReferenceOutput(
this.GetImageComparerForOrigDecoder(provider), this.GetImageComparer(provider),
provider, provider,
appendPixelTypeToFileName: false); appendPixelTypeToFileName: false);
} }
@ -294,7 +293,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
provider.Utility.TestName = DecodeProgressiveJpegOutputName; provider.Utility.TestName = DecodeProgressiveJpegOutputName;
image.CompareToReferenceOutput( image.CompareToReferenceOutput(
ImageComparer.Tolerant(ProgressiveTolerance_PdfJs), this.GetImageComparer(provider),
provider, provider,
appendPixelTypeToFileName: false); appendPixelTypeToFileName: false);
} }

Write Preview
Loading…
Cancel
Save