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

Fixed compilation errors

pull/1864/head
Dmitry Pentin 5 years ago
parent
7617b38fec
commit
311748ef61
6 changed files with 37 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs
  2. 10
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs
  3. 10
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs
  4. 16
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs
  5. 8
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
  6. 10
      tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs

8
tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs
View File

@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromCmykBasic(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromCmykScalar(8).ConvertToRgbInplace(values);
}
[Benchmark]
@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
new JpegColorConverterBase.FromCmykVector8(8).ConvertToRgbInplace(values);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Benchmark]
public void SimdVectorAvx2()
public void SimdVectorAvx()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromCmykAvx2(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromCmykAvx(8).ConvertToRgbInplace(values);
}
#endif
}
}

10
tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors.
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
using BenchmarkDotNet.Attributes;
@ -19,15 +19,17 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromGrayscaleBasic(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromGrayscaleScalar(8).ConvertToRgbInplace(values);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Benchmark]
public void SimdVectorAvx2()
public void SimdVectorAvx()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromGrayscaleAvx2(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromGrayscaleAvx(8).ConvertToRgbInplace(values);
}
#endif
}
}

10
tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors.
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
using BenchmarkDotNet.Attributes;
@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromRgbBasic(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromRgbScalar(8).ConvertToRgbInplace(values);
}
[Benchmark]
@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
new JpegColorConverterBase.FromRgbVector8(8).ConvertToRgbInplace(values);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Benchmark]
public void SimdVectorAvx2()
public void SimdVectorAvx()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromRgbAvx2(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromRgbAvx(8).ConvertToRgbInplace(values);
}
#endif
}
}

16
tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs
View File

@ -19,15 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromYCbCrBasic(8).ConvertToRgbInplace(values);
}
[Benchmark(Baseline = true)]
public void SimdVector()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromYCbCrVector4(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromYCbCrScalar(8).ConvertToRgbInplace(values);
}
[Benchmark]
@ -38,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
new JpegColorConverterBase.FromYCbCrVector8(8).ConvertToRgbInplace(values);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Benchmark]
public void SimdVectorAvx2()
public void SimdVectorAvx()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromYCbCrAvx2(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromYCbCrAvx(8).ConvertToRgbInplace(values);
}
#endif
}
}

8
tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors.
// Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0.
using BenchmarkDotNet.Attributes;
@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromYccKBasic(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromYccKScalar(8).ConvertToRgbInplace(values);
}
[Benchmark]
@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
new JpegColorConverterBase.FromYccKVector8(8).ConvertToRgbInplace(values);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Benchmark]
public void SimdVectorAvx2()
{
var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
new JpegColorConverterBase.FromYccKAvx2(8).ConvertToRgbInplace(values);
new JpegColorConverterBase.FromYccKAvx(8).ConvertToRgbInplace(values);
}
#endif
}
}

10
tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
View File

@ -70,6 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromYCbCrAvx2(int inputBufferLength, int resultBufferLength, int seed)
@ -87,6 +88,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
resultBufferLength,
seed);
}
#endif
[Theory]
[MemberData(nameof(CommonConversionData))]
@ -130,6 +132,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromCmykAvx2(int inputBufferLength, int resultBufferLength, int seed)
@ -147,6 +150,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
resultBufferLength,
seed);
}
#endif
[Theory]
[MemberData(nameof(CommonConversionData))]
@ -172,6 +176,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromGrayscaleAvx2(int inputBufferLength, int resultBufferLength, int seed)
@ -189,6 +194,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
resultBufferLength,
seed);
}
#endif
[Theory]
[MemberData(nameof(CommonConversionData))]
@ -232,6 +238,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromRgbAvx2(int inputBufferLength, int resultBufferLength, int seed)
@ -249,6 +256,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
resultBufferLength,
seed);
}
#endif
[Theory]
[MemberData(nameof(CommonConversionData))]
@ -292,6 +300,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
seed);
}
#if SUPPORTS_RUNTIME_INTRINSICS
[Theory]
[MemberData(nameof(CommonConversionData))]
public void FromYccKAvx2(int inputBufferLength, int resultBufferLength, int seed)
@ -309,6 +318,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
resultBufferLength,
seed);
}
#endif
[Theory]
[MemberData(nameof(CommonConversionData))]

Write Preview
Loading…
Cancel
Save